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

Possible to merge in the reverse of a change?

From: Steinar Bang <sb_at_dod.no>
Date: Sun, 14 Sep 2008 15:47:31 +0200

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_at_134, but that gave me no diffs to
the repo.)


- Steinar

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 15:48:47 CEST

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

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