________________________________
From: Brian E. Fox [mailto:brianf@reply.infinity.nu]
Sent: mercredi, 7. mars 2007 22:04
To: users@subversion.tigris.org
Subject: Branch from working copy
Hi,
Let me start by saying that we switched our company over to SVN from CVS 1.5 years ago. As far as I'm concerned, SVN is hands down the best SCM tool I've ever used. The documentation is also one of the best I've seen in OSS.
I just have one small issue that I can't seem to find the answer to. When developers create a branch from working copy, the copy and the commits are committed in a single revision (as the doc says). This causes problems when merging because diffing R-1 on that branch causes an error because the branch didn't exist in R-1. What is the correct way to recover from this and perform the merge? (no matter how many times I instruct the devs to make the branch first, switch and then commit, inevitably someone does it and then comes crying to me)
Did you try:
svn merge <url_from_which_the_workspace_were_created(maybe trunk...)>@R-1 <branch_url>@R
Regards
Christophe
Received on Thu Mar 8 14:51:26 2007