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

RE: [PROPOSAL] Merging Improved

From: Sander Striker <striker_at_apache.org>
Date: 2003-04-10 23:43:53 CEST

> From: Branko Cibej [mailto:brane@xbc.nu]
> Sent: Thursday, April 10, 2003 11:07 PM

> Sander Striker wrote:
>
> >There will also be no lines in svn:merged where PATH is equal to
> >the path of M in the repository.
> >
> >
> Then what happens if you use merge to undo a change on the same branch?
> For example: say you're at revision 5 of /trunk, and you want to undo
> the changes that went in at revision 3. Presumably, this is what you'd do:
>
> svn merge -r3:2 url://of/trunk .
>
> Shouldn't this record "trunk@3:2", or something? (Yes, I know this is
> nitpicking... i mean, cherry picking)

Yes. See example 3, CP1 and CP2 ;) (guess what CP stands for).

Sander

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 10 23:44:40 2003

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