RE: Merge problem after changing directory tree structure

Thank you! I understand this revision addressing syntax much better
now! Knowing that I can merge using this syntax, I feel *much* more
comfortable changing my repository structure while developing on a
branch.

Derek

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

On Tue, 2004-03-30 at 13:07, Derek Mahar wrote:
> By the way, would you please explain to me or refer me to an
> explanation of the difference between the "-r x:y URL" and "URL@x
> URL@y" revision addressing syntax? I'd like to understand better why
>
> svn merge $REPOS/project/a/branches/branch1@2 \
> $REPOS/project/b/branches/branch1@HEAD
>
> merges correctly, but
>
> svn merge -r2:HEAD $REPOS/project/b/branches/branch1
>
> does not.

The true, "fully expanded" form of diff and merge is:

   svn [diff|merge] URL1@X URL2@Y

This syntax allows you to compare any two directories anywhere in the
repository's history.

The form

   svn [diff|merge] -rX:Y URL

is just a shorthand for

   svn [diff|merge] URL@X URL@Y

So the first example works, because you're asking for a comparison of
two different paths in two different revisions. The second example
fails, because you're asking for a comparison of the *same* path in both
revisions, and the path doesn't exist in one of them.

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 21:27:45 2004