Re: Possible to merge in the reverse of a change?

On Sep 14, 2008, at 8:59 AM, Steinar Bang wrote:

>>>>>> Steinar Bang <sb_at_dod.no>:
>
>> Platform: debian etch, Intel Pentium II,
>> svn 1.4.2dfsg1-2
>
> [snip!]
>> Is there some "svn merge" magic that can merge in the reverse of the
>> change from r134 to r160, and that will preserve the line history?
>
> Well the merge operation was pretty easy
> svn merge -r 160:134 .procmailrc
>
> But it didn't preserve the blame information. It still shows the
> version it was last commited in.

Correct.

If you were using svn 1.5 or later with its new merge tracking
feature, you could use blame's new "--use-merge-history" flag to get
what you want.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-14 18:30:56 CEST