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

Merging a second-order branch

From: Simon McClenahan <smcclenahan_at_healthcompartners.com>
Date: 2004-04-26 22:13:06 CEST

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
Received on Mon Apr 26 22:13:45 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.