RE: Re: Merging a second-order branch

Please ignore my previous post. Ben's answer is much more accurate than
the solution that I suggested.

Derek

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: April 26, 2004 5:11 PM
To: Simon McClenahan
Cc: Subversion Users (E-mail)
Subject: 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

NOTICE: This email contains privileged and confidential information and is intended only for the individual to whom it is addressed. If you are not the named addressee, you should not disseminate, distribute or copy this e-mail. Please notify the sender immediately by e-mail if you have received this transmission by mistake and delete this communication from your system. E-mail transmission cannot be guaranteed to be secured or error-free as information could be intercepted, corrupted, lost, destroyed, arrive late or incomplete, or contain viruses.

AVIS: Le présent courriel contient des renseignements de nature privilégiée et confidentielle et n’est destiné qu'à la personne à qui il est adressé. Si vous n’êtes pas le destinataire prévu, vous êtes par les présentes avisés que toute diffusion, distribution ou reproduction de cette communication est strictement interdite.  Si vous avez reçu ce courriel par erreur, veuillez en aviser immédiatement l’expéditeur et le supprimer de votre système. Notez que la transmission de courriel ne peut en aucun cas être considéré comme inviolable ou exempt d’erreur puisque les informations qu’il contient pourraient être interceptés, corrompues, perdues, détruites, arrivées en retard ou incomplètes ou contenir un virus.  

---------------------------------------------------------------------
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:21:58 2004