[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-29 19:48:39 CEST

But I am comparing subtrees. I'm comparing a/branches/branch1 with
itself between revisions 2 and 3.

The problem is that I renamed an ancestor directory in the URL since I
created the branch and Subversion does not seem to let me merge the
changes on the branch that I committed before I renamed the ancestor
directory.

Let's look at my specific case. In the attached Log.txt, you'll notice
that in revision 334, I renamed ancestor directory "Bloomberg Pricing
Engine Feed" to "Pricing Engine Feed" and in revision 296, I created
branch "Develop 0.2" from "Develop 0.1". Because I renamed the ancestor
directory after I created the branch, Subversion does not permit me to
merge the changes between revisions 296 and the 334 (workspace URL is
https://localhost/subversion/project/Bloomberg/Pricing%20Engine%20Feed/P
rotocol/trunk):

[dmahar@isdev001 Latest]$ svn merge -r296:334
https://localhost/subversion/project/Bloomberg/Bloomberg%20Pricing%20Eng
ine%20Feed/Protocol/branches/Develop%200.2 .
svn: REPORT request failed on '/subversion/project/!svn/vcc/default'
svn: REPORT of '/subversion/project/!svn/vcc/default': Could not read
chunk size: Secure connection truncated (https://localhost)

Using "Pricing Engine Feed" instead of "Bloomberg Pricing Engine Feed":
[dmahar@isdev001 Latest]$ svn merge -r296:334
https://localhost/subversion/project/Bloomberg/Pricing%20Engine%20Feed/P
rotocol/branches/Develop%200.2 .
svn: REPORT request failed on '/subversion/project/!svn/vcc/default'
svn: REPORT of '/subversion/project/!svn/vcc/default': Could not read
chunk size: Secure connection truncated (https://localhost)

However, Subversion *does* allow me to merge the branch changes that I
committed after I renamed the ancestory directory:

[dmahar@isdev001 Latest]$ svn merge -r334:HEAD
https://localhost/subversion/project/Bloomberg/Pricing%20Engine%20Feed/P
rotocol/branches/Develop%200.2 .
C
source/com/penson/bloomberg/feed/pricingEngine/protocol/Connection.java

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 Mon Mar 29 19:49:33 2004

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