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

Re: Partially merging a old revision

From: Hari Kodungallur <hkodungallur_at_gmail.com>
Date: Wed, 16 Apr 2008 14:49:41 -0700

On Wed, Apr 16, 2008 at 2:23 PM, Laker Netman <laker_netman_at_yahoo.com>
wrote:

> Is it possible to pick, say, one of three changes made in a particular old
> revision of an individual file and merge it back into "head" version of that
> file? If so, where can I find documentation on it? I looked in the
> Subversion book, but everything I could find pertained to merge entire
> documents or branches.
>
> Otherwise, I presume I can just copy an paste the desired portion in the
> old rev into my WC version and submit it, though that seems less elegant.
>
> I'm running TortiseSVN, FWIW.
>

You can pick all the changes within one file (out of several) from a
particular revision -- by, well, merging just that file. But it is not
possible to pick a subset of changes within a single file when you do a
merge.
The less elegant way you mentioned is the way out!

regards,
-Hari
Received on 2008-04-16 23:50:10 CEST

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