[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: conflicts where there shouldn't be?

From: Bob Hiestand <bob.hiestand_at_gmail.com>
Date: 2006-12-18 22:38:26 CET

On 12/14/06, Swenson, Eric <Eric.Swenson@am.sony.com> wrote:

> We decided we needed a branch during a period where two developers, in
> particular, had outstanding modifications (not yet checked in) in their
> working copy of the "trunk". One of those developers created the branch by
> using the command:
>
> svn copy <working-copy> <url-to-new-branch>

Did you later check in (on the original branch) the files that were
modified when the copy occurred?

> Once this was done, development continued for the group on the
> <url-to-new-branch>. Everything was fine until the time that we wanted to
> merge the branch to the trunk.
>
> We did an:
>
> svn co <url-of-trunk>
>
> svn merge r NNN:HEAD <url-of-new-branch>

How did you determine NNN?

Problem 2:

> svn copy <url-of-trunk> <url-of-trunk.old>
> svn rm <url-of-trunk>
> svn mkdir <url-of-trunk>
> svn copy <url-of-vendor-xxx> <url-of-trunk>
> Yet, we received hundreds of merge conflicts. When we inspected the merge
> conflicts, none of the conflicted files had, in fact, been changed on
> "trunk.old". There should have been no conflicts. However, we noticed that
> the conflicts occurred for files that had changes checked into
> <url-of-vendor-xxx> and subsequently copied to <url-of-trunk>.

Taking a wild guess, but I think the problem may be the 'mkdir'
command. You probably ended up with an extra directory there
(trunk/url-of-vendor-xxxx) instead of making trunk a copy of
url-of-vendor-xxx, which is probably what you intended.

Thank you,

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 18 22:39:02 2006

This is an archived mail posted to the Subversion Users mailing list.