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

RE: Merging a second-order branch

From: Derek Mahar <DMahar_at_penson.ca>
Date: 2004-04-26 23:15:58 CEST

Assuming that you created revision 82 when you moved
branches/privatebranch to branches/taskbranch, you need to merge
branches/taskbranch@82 to trunk. branches/taskbranch does not exist in
revision 81.


-----Original Message-----
From: Simon McClenahan [mailto:smcclenahan@healthcompartners.com]
Sent: April 26, 2004 4:13 PM
To: Subversion Users (E-mail)
Subject: 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

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:16:52 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.