RE: Tree conflict help.

On Wed, Dec 09, 2009 at 03:17:26, Stefan Sperling wrote:
> ...

Thanks for the reply. I resolved the issue by specifying the revisions
to merge. I was under the impression that a merge between a branch and
its parent would automatically start at the point where they diverge,
but apparently not. (And this particular repo is old, so it doesn't even
support --reintegrate).

So I'm good for now. Still a little surprised by the behavior, but able
to work around it. To answer your questions, however:

> Why not use separate working copies for trunk and the branch.

I just did it that way in the transcript since it made for an easier
command sequence.

> You now have a mixed-revision working copy. Merging into a
> mixed-revision working copy is never a good idea.

How can it be mixed? I just commited from it.

> Do the tree conflicts still happen if you run "svn update"
> at this point?

Sure. svn up is a no-op - "at revision 4865."

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2428862

Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-12-09 15:45:09 CET