Manual updates

Main development forum.

Re: Manual updates

Postby kimmov » Wed Jun 03, 2009 4:52 pm

Oh, I don't actually mean you need to do merge with SVN tool. You can just copy files from trunk to branch and commit changes. Or compare trunk and 2.12 branch with WinMerge and copy/merge changes with WinMerge. So whatever methods feels easiest for you. :)

I myself almost never use SVN merge, but I simply copy files or use WinMerge to copy changes. Its much easier and faster. And I have control what changes get transferred. Yes, it loses some history data but nothing that has any value.
Posts: 562
Joined: Thu Sep 11, 2008 8:51 pm
Location: Finland

Re: Manual updates

Postby denisbradford » Thu Jun 04, 2009 12:08 pm

kimmov wrote:Can you merge your commits from trunk to 2.12 branch. I guess most (if not all) are good for 2.12?

Seems I don't have time to release 2.12.4 this week. But I'll try to make the release next Tuesday.

Merged, committed -r6815 on 2.12 branch.
Also updated minor version to 2.12.4 in replaceables.xml on trunk (which I probably should have done first). -r6816.
Posts: 46
Joined: Thu Sep 25, 2008 12:24 pm
Location: U.S.A.


Return to Developers

Who is online

Users browsing this forum: No registered users and 2 guests