Svn Merging Dev/Prod with TortoiseSVN

    For some of my professional projects I don't get to choose the environment and when that happens I'm forced to learn or re-learn in this case certain tools/technologies. I can't take complete credit for this article as it was mostly written by a previous co-worker however nothing here is secretive and it shouldn't be; since none of it is proprietary. 

 Merging from Trunk to Branch  
After making any change in trunk, immediately merge those changes to the branch, Make sure your working copy of your branch has no un-commited changes. Open command prompt and change into tortise bin folder.
  1. Usually: c:\Program Files\TortoiseSVN\bin\ 
  2. Update your branch working copy with the following command:
  3. TortoiseProc.exe /command:update /path:C:\Development\YOURPROJECT
  4. Replace the path parameter with the actual path to your branch working copy
  5. Run the following command:
  6. TortoiseProc.exe /command:merge /fromurl:https://subversion.com/YOURPROJECT
  7. The following screen will appear. Leave the defaults selected as shown, and click next.
  8. On the next screen, leave the defaults and click Test Merge.
  9. Ensure the results look as expected.
  10. Click merge
  11. COMMIT THE MERGE using the following command:
  12. TortoiseProc.exe /command:commit /path:C:\Development\YOURPROJECT
  13. If you want to be sure it was successful, repeat steps 1-4. The “Test merge” should show nothing to do.
Merging from Branch to Trunk
First you must follow the steps above to update the branch from the trunk!
  1. Even if there is nothing new in trunk, this must be done so subversion will record the revisions to be able to do the reintegration successfully
  2. Make sure your working copy of your trunk has no un-commited changes
  3. Update your trunk working copy with the following command:
    TortoiseProc.exe /command:update /path:C:\Development\YOURPROJECT
    Replace the path parameter with the actual path to your trunk working copy
  4. Open command prompt and run the following command:
    TortoiseProc.exe /command:merge /fromurl:https://subversion.com/YOURPROJECT /path:C:\Development\YOURPROJECT
  5. The following screen will appear. Leave the defaults selected as shown, and click next.


  6. On the next screen, leave the defaults and click Test Merge
  7. Ensure the results look as expected.
  8. Click merge
  9. COMMIT THE MERGE using the following command:
    TortoiseProc.exe /command:commit /path:C:\Development\YOURPROJECT
  10. If you want to be sure it was successful, repeat steps 1-4. The “Test merge” should show nothing to do.

Popular posts from this blog

UI-Bootstrap Collapsible Sticky Footer

    I could have done this a lot of ways and ultimately I made it work with javascript modifying the class names. I also had to create multiple class names which I didn't like to much, I might come back and improve this but for now this is was I got. Also I call bootstrap+angularjs = ui-bootstrap, not sure if that's common sense but thought I should include it somewhere in my notes. Working Example: http://plnkr.co/edit/2N9ENlbw3bSvg1W9n0ch?p=preview This little css was key to prevent any kind of animation on the collapse, which would result in a scrollbar appearing on the body. A scrollbar can appear when the content's too long but not on the sticky foot duh! .no-animate { transition-duration: 0.0125s; } Research Angular-UI Bootstrap Collapse without animation - Stack Overflow http://jsfiddle.net/paulalexandru/Z2Lu5/  - Was looking at this to see if I could reuse it but I ended but just doing my own thing. Another way which I've seen Using a sticky
Read more

Installing Windows on Acer chromebook 15 cb3-532

Much of my notes are just small problems I faced (what's new!) haha. Either way this was a really fun project to do for a friend and I got excited once I research all the information. You can find instruction videos but what helped me the most was the coolstar website. Sadly they don't have parameters in the url so I can link the machine I used in this article. -  https://coolstar.org/chromebook/windows-install.html Scared of messing with the bios? Don't be!    So you need to first remove the screw to put a legacy bios on the machine. Its easy to backup the chrome os one and with the same steps to change it. You can go back in and revert to the chrome version bios. Its that last part that had me worried and its very easy to do.  Problems getting into Developer Mode?   Follow the instructions to the letter, during the step to disable the OS verification, press Ctrl-D to boot into os. If you hear two beeps I would go back to set one. I got in a loop where it s
Read more

Aspetcore: NLog with Postgresql

This Article is base ASP.Net Core 2 and the latest version of Nlog. 1. Install NLog and the Postgresql Package Using NuGet to install the package into your ASP.NET Core project: PM > Install-Package NLog.Web.AspNetCore PM > Install-Package Npgsql 3. Register NLog Add in your Startup.cs  public void Configure ( IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory ) { ... env.ConfigureNLog( "nlog.config" ); ... // make sure Chinese chars don't fk up Encoding.RegisterProvider(CodePagesEncodingProvider.Instance); //add NLog to ASP.NET Core loggerFactory.AddNLog(); //add NLog.Web app.AddNLogWeb(); } 4. Add to Your Controller Add a logger object to your Controller. private readonly ILogger<YourController> _logger; Modify the constructor to use it public YourController ( ILogger<YourController> logger = null ) { if ( null != logger) { _logger = logger;
Read more