Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > Re: An easy one for ya!

subversion
Discussion topic

Back to topic list

Re: An easy one for ya!

Author mdiers
Full name Michael Diers
Date 2009-10-09 13:40:17 PDT
Message 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

« Previous message in topic | 2 of 4 | Next message in topic »

Messages

Show all messages in topic

An easy one for ya! jonathh Jon H 2009-10-09 06:42:07 PDT
     Re: An easy one for ya! mdiers Michael Diers 2009-10-09 13:40:17 PDT
     RE: An easy one for ya! "Srilakshmanan, Lakshman" <lakshman dot srilakshmanan at police dot vic dot gov dot au> "Srilakshmanan, Lakshman" <lakshman dot srilakshmanan at police dot vic dot gov dot au> 2009-10-11 23:52:12 PDT
         RE: An easy one for ya! jonathh Jon H 2009-10-12 04:40:17 PDT
Messages per page: