http://www.svnforum.org/ en Wed, 22 May 2013 18:30:28 GMT vBulletin 60 http://www.svnforum.org/images/misc/rss.png http://www.svnforum.org/ http://www.svnforum.org/threads/51630-No-merge-conflict-for-deleted-folder?goto=newpost Sat, 11 May 2013 18:58:10 GMT Baseline: * BranchA - FolderA contains FileA * BranchB branch from BranchA Commits: * BranchA - FileA move out of FolderA to root Baseline:

• BranchA - FolderA contains FileA
• BranchB branch from BranchA

Commits:

• BranchA - FileA move out of FolderA to root
• BranchA - FolderA deleted
• BranchB - FileA modified

If I merge BranchA into BranchB I will not get any merge conflict. In BranchB the FolderA is deleted and FileA is not modified and I have miss the changed in FileA done in BranchB. Even If I have done the changes in BranchA in 1 or 2 commit the result is the same.

If I merge BranchB into BranchA I will get a merge conflict as expected.

What is best pratices about this merge situation? ]]> Version Control Practices chitech http://www.svnforum.org/threads/51630-No-merge-conflict-for-deleted-folder http://www.svnforum.org/threads/51305-Tag-Revision-Number?goto=newpost Tue, 07 May 2013 02:00:59 GMT Hi Guys,

I'm using TortoiseSVN 1.7.11, Build 23600 - 64 Bit , 2012/12/12 19:08:52 client and I have a question about tagging and the revision number assigned to the tagged copy.

In my Repo setup I have a Development section and a Deployed section.
Once the code is tested and released to the customer I Tag a copy to the Deployed section.
I want the Deployed Copy to display the same Revision number as the Head Revision as they are the same at the time of deployment.

I have previously done this with an older version of Tortoise but with the current version of Tortoise it seems to increment the revision of the deployed tagged copy when viewed with the Repo browser.

Any advice on how to Tag and maintain the revision number would be appreciated.

Thanks,

Red. ]]> Version Control Practices Red Diablo http://www.svnforum.org/threads/51305-Tag-Revision-Number