[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: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2004-03-30 21:20:08 CEST

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.

---------------------------------------------------------------------
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:21:18 2004

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