Possible to merge in the reverse of a change?

[Steinar Bang <sb...@dod.no>]

Platform: debian etch, Intel Pentium II, 
	  svn 1.4.2dfsg1-2

Here's what I'm trying to do:
 - I have a .procmailrc that was deleted on trunk in r294
 - I have used svn cp to copy the last version of the .procmailrc prior
   to delete (r293) into a branch, and commited it to the repo
 - A set of mailing list filtering rules were deleted from the
   .procmailrc in r160
 - Now I would like to get in the last version of the .procmailrc file
   that contained mailing list foldering (r134), specifically I would
   like to get the lines that dealt with mailing list filtering

The easy way around here is to copy in the .procmailrc from r134, look
at the diff, and remove/add the stuff that didn't fit.  But that will
give me no line history on annotate for the mail filtering rules.

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?

(I tried merging in just .procmailrc@134, but that gave me no diffs to
the repo.)


Thanx!


- Steinar


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

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

[Steinar Bang <sb...@dod.no>]

>>>>> Ryan Schmidt <su...@ryandesign.com>:

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

Thanx for the information!

But that will only work on merges done in versions from 1.5 on (or using
tracking information added by svnmerge.py on older svn versions)?

The history of the merge I just did, is lost?  (side note: no big deal
if it is, I'm just curious if it has been preserved, and I didn't know)


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

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

[Ryan Schmidt <su...@ryandesign.com>]

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

>>>>>> Steinar Bang <sb...@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@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

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

[Steinar Bang <sb...@dod.no>]

>>>>> Steinar Bang <sb...@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.

Oh well!


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org