[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: Branko Čibej <brane_at_xbc.nu>
Date: 2003-04-11 00:06:23 CEST

Sander Striker wrote:

>>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).
>
>

Right. But I'm confused, because in your proposal (my first quote from
you, above) you say that merges from the same path would *not* be
recorded. I'd like to understand if such records are really unnecessary.

-- 
Brane Čibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Apr 11 00:07:06 2003

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