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

RE: Merge problem after changing directory tree structure

From: Derek Mahar <DMahar_at_penson.ca>
Date: 2004-03-30 20:10:11 CEST

Given the following, how do I merge directory 'new' on branch1 into a
working copy of $REPOS/project/b/trunk? Notice that *after* I created
branch1, I renamed ancestor directory 'a' to 'b'.

svnadmin create /home/svn/test REPOS=https://localhost/subversion/test
mkdir project
mkdir -p project/a/trunk
mkdir -p project/a/branches
svn import -m 1 $REPOS
svn copy -m 2 $REPOS/project/a/trunk $REPOS/project/a/branches/branch1
svn mkdir -m 3 $REPOS/project/a/branches/branch1/new
svn rename -m 4 $REPOS/project/a $REPOS/project/b
svn co $REPOS/project/b/trunk work
cd work
svn merge -r 3:HEAD $REPOS/project/b/branches/branch1
Output:
svn: REPORT request failed on '/subversion/test/!svn/vcc/default'
svn:
Invalid editor anchoring; at least one of the input paths is not a
directory and there was no source entry

Derek

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]
Sent: March 27, 2004 10:30 AM
To: Derek Mahar
Cc: users@subversion.tigris.org
Subject: Re: Merge problem after changing directory tree structure

Derek Mahar wrote:

> How do I now merge the changes to b/branches/branch1 in revision 3 to
> b/trunk so that I get b/trunk/a.txt? If I specify b/branches/branch1
at
> revision 3 as the merge source revision, Subversion complains that
> b/branches/branch1 does not exist in revision 3. Is there a
workaround
> to this problem?

Sure: don't compare repository roots. Compare subtrees instead.

In your case, assuming you have a working copy of /b/trunk in local
directory "wc", you'd run

     svn merge -r2:3 schema://.../a/branches/branch1 wc

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 Tue Mar 30 20:10:54 2004

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