Re: Merging a second-order branch

On Mon, 2004-04-26 at 15:13, Simon McClenahan wrote:
> I did a copy from trunk to branches/privatebranch creating revision
> 81.
> Then I did a move branches/privatebranch to branches/taskbranch.
> I am trying to merge branches/taskbranch@81 back to trunk, but I get a
> non-sensical error message back from T*******SVN client ;-) (XML no
> root element) . Am I attempting to do a merge the right way, or did I
> mess things up by doing a copy from privatebranch to taskbranch?

No idea about how TortoiseSVN's merging command works, or why this move
may have screwed things up. Please send your question to the
TortoiseSVN mailing lists; this list is about the svn core software and
commandline client.

In the commandline client world, you would simply cd into your trunk
working copy, and run

   svn merge privatebranchURL@81 taskbranchURL@HEAD

Remember that merge compares two trees, and applies the diff to your
working copy. In your situation, these are the two trees to compare.
 

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Apr 26 23:15:20 2004