[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: Reedick, Andrew <jr9445_at_ATT.COM>
Date: Thu, 17 Apr 2008 08:23:47 -0500

> -----Original Message-----
> From: Laker Netman [mailto:laker_netman_at_yahoo.com]
> Sent: Wednesday, April 16, 2008 5:24 PM
> To: users_at_subversion.tigris.org
> Subject: Partially merging a old revision
>
> 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.
>

Merge the revision/three_files, revert the other two, and commit the
merge.

The real question is how you accurately record such a partial merge.

*****

The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. GA623

---------------------------------------------------------------------
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 15:24:40 CEST

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