You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Simon McClenahan <sm...@healthcompartners.com> on 2004/04/26 20:13:06 UTC
Merging a second-order branch
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?
- Simon
--------------------------
NOTE: This message and any included attachments are from HealthCom Partners, LLC and are intended only for the addressee(s). The information contained herein may include trade secrets or privileged or otherwise confidential information. Unauthorized review, forwarding, printing, copying, distributing, or using such information is strictly prohibited and may be unlawful. If you received this message in error, or have reason to believe you are not authorized to receive it, please promptly delete this message and notify the sender by e-mail.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merging a second-order branch
Posted by Ben Collins-Sussman <su...@collab.net>.
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