You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jon H <jd...@yahoo.com> on 2009/10/09 13:42:05 UTC
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@eHardcastle.com
'Do not worry about tomorrow, for tomorrow will bring worries of its own.'
-----------------------
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2405534
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
Re: An easy one for ya!
Posted by Michael Diers <md...@elego.de>.
Jon H wrote:
> 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!
Nice try Jon, by no means this is an easy one.
Yes, you _could_ generate that patch which removes the unwanted feature.
But does this reflect the way you work? I wonder.
If the bad feature made it into the "stable" Main code line in the first
place, does that not indicate a problem with QA in the pre-integration
code line? This is where the correction needs to take place. Add a
failing test, then fix it by removing the "bad" feature.
I think your initial idea of backing out the whole integration and
starting over does have its merits.
Another approach would be to fix the issue after integration, _no matter
what_. This would place the burden on the whole team. You allow someone
to integrate stuff, everyone is responsible it works.
--
Michael Diers, elego Software Solutions GmbH, http://www.elego.de
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2405667
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: An easy one for ya!
Posted by Jon H <jd...@yahoo.com>.
Thanks for that. It is a big if as developers tend to do fixes over a couple. But it might work.
Can this be applied using Tortoise?
-----------------------
N: Jon Hardcastle
E: Jon@eHardcastle.com
'Do not worry about tomorrow, for tomorrow will bring worries of its own.'
-----------------------
--- On Mon, 12/10/09, Srilakshmanan, Lakshman <la...@police.vic.gov.au> wrote:
> From: Srilakshmanan, Lakshman <la...@police.vic.gov.au>
> Subject: RE: An easy one for ya!
> To: Jon@eHardcastle.com
> Cc: users@subversion.tigris.org
> Date: Monday, 12 October, 2009, 7:51 AM
> 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@yahoo.com]
>
> Sent: Saturday, 10 October 2009 12:42 AM
> To: users@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@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@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=2406592
To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].
RE: An easy one for ya!
Posted by "Srilakshmanan, Lakshman" <la...@police.vic.gov.au>.
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@yahoo.com]
Sent: Saturday, 10 October 2009 12:42 AM
To: users@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@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@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@subversion.tigris.org].