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

RE: Re: Partially merging a old revision

From: Bicking, David (HHoldings, IT) <David.Bicking_at_thehartford.com>
Date: Thu, 17 Apr 2008 08:55:21 -0400

> -----Original Message-----
> From: Ryan Schmidt [mailto:subversion-2008b_at_ryandesign.com]
>
> On Apr 16, 2008, at 4:49 PM, Hari Kodungallur wrote:
>
> > On Wed, Apr 16, 2008 at 2:23 PM, Laker Netman 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!
>
> Right, and it's not really a problem anyway. Subversion
> doesn't know the difference between changes that were made by
> hand and changes that were made as a result of a merge. To
> Subverison it's all the same.

Is it not as simple as doing the merge, then comparing the working copy
with the base? I use TortoiseMerge to view the diffs and pick and
choose what I want to keep. Since I use svnmerge, once I make my
selections, I never have to make the choice again.

--
David
*************************************************************************
This communication, including attachments, is
for the exclusive use of addressee and may contain proprietary,
confidential and/or privileged information.  If you are not the intended
recipient, any use, copying, disclosure, dissemination or distribution is
strictly prohibited.  If you are not the intended recipient, please notify
the sender immediately by return e-mail, delete this communication and
destroy all copies.
*************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-04-17 14:56:14 CEST

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