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

Re: Merge doesn't honour specified SOURCE

From: Karl Fogel <kfogel_at_red-bean.com>
Date: Tue, 24 Jun 2008 14:59:46 -0400

Jens Seidel <jensseidel_at_users.sf.net> writes:
> I noticed the following behaviour in merge (svn 1.5.0) which seems to
> violate the svn help merge output:
> Create a repository containing a file src/dir/file. Change this file
> in revision 2 and try to revert it using:
> $ svn merge -c -2 src
> Nothing happens! Specifying . or src/dir/file instead of src it works.
> This violates the help:
> 3. merge [-c M[,N...] | -r N:M ...] SOURCE[@REV] [WCPATH]
> 3. In the third form, SOURCE can be either a URL or a working copy
> path (in which case its corresponding URL is used). SOURCE (in
> revision REV) is compared as it existed between revisions N and M for
> each revision range provided. If REV is not specified, HEAD is
> assumed. '-c M' is equivalent to '-r <M-1>:M', and '-c -M' does the
> reverse: '-r M:<M-1>'. If no revision ranges are specified, the
> default range of 0:REV is used. Multiple '-c' and/or '-r' instances
> may be specified, and mixing of forward and reverse ranges is allowed.
> $ svn diff -c 2 src produces an output and confirms that there is a
> change in src in r2.
> A bug?

I think it's a bug too. Do you have time to trace it? That is, find
the place in the code where we ought to be doing something (like, uh,
merging/reverse-merging the change) but aren't?

To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-24 21:00:26 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.