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

RE: An easy one for ya!

From: Srilakshmanan, Lakshman <lakshman.srilakshmanan_at_police.vic.gov.au>
Date: Mon, 12 Oct 2009 17:51:49 +1100

Hi Jon,

If, in your branch you can identify the commit revisions associated with
the feature you need to remove, then you can perform a reverse merge on
your trunk using the revision range from your branch.

ie
checkout trunk to proj-trunk
cd proj-trunk
svn merge -r15:12 http://xxxx/svn/proj/branchA

Thanks
Lakshman
-----Original Message-----
From: Jon H [mailto:jd_hardcastle_at_yahoo.com]
Sent: Saturday, 10 October 2009 12:42 AM
To: users_at_subversion.tigris.org
Subject: An easy one for ya!

the way we manage our development is so that all work is done in
branches. Limited to 1 new feature or 1~6 fixes (depending on
size/scope) per branch.

Now lets say I merge in a branch that has 6 fixes in it, into our
Main(trunk). if it is decided to back out 1 of those features the only I
know how is to remove all the features that came with it, and then
resurrect the branch they came from.. remove the feature from that and
then re-merge the remaining features..

to avoid doing this I wonder, is it possible to generate a patch file
form the parent branch and generate a patch of the work done for a fix,
and then apply it to the main development in reverse? so it REMOVES what
the patch matches rather than adds?

suggestions/answers on a postcard!

-----------------------
N: Jon Hardcastle
E: Jon_at_eHardcastle.com
'Do not worry about tomorrow, for tomorrow will bring worries of its
own.'
-----------------------

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageI
d=2405534

To unsubscribe from this discussion, e-mail:
[users-unsubscribe_at_subversion.tigris.org].

================================================================================================
EMAIL DISCLAIMER

This email and any attachments are confidential. They may also be subject to copyright.

If you are not an intended recipient of this email please immediately contact us by replying
to this email and then delete this email.

You must not read, use, copy, retain, forward or disclose this email or any attachment.

We do not accept any liability arising from or in connection with unauthorised use or disclosure
of the information contained in this email or any attachment.

We make reasonable efforts to protect against computer viruses but we do not accept liability
for any liability, loss or damage caused by any computer virus contained in this email.
================================================================================================

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2406522

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-12 08:53:24 CEST

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