Question about features
Tom Widmer
tom.widmer at googlemail.com
Wed Nov 4 14:27:47 GMT 2009
Daniel Carrera wrote:
> 2) I can unrecord changes (similar to "bzr uncommit"), but I can go
> back in history and basically cherry pick which changes I want to
> uncommit. For example:
>
> -> Commit Feature A
> -> Commit Feature B
> Ooops, I made a mistake in A.
> -> Uncommit Feature A
> Fix feature A.
> -> Commit Feature A.
>
>
> Can Bazaar do these things?
This case would normally be handled using branchy development. I suspect
this sounds heavy weight to you, but this is what is involved in practice:
bzr init-repo --no-trees .
bzr branch upstreamurl trunk
bzr co --lightweight trunk working
cd working
bzr switch --create-branch featureA
hack
bzr commit
bzr switch --create-branch featureB
hack
bzr commit
bzr switch --create-branch integration
bzr merge ../featureA
test or whatever
bzr commit
bzr switch featureA
fix bug
bzr commit
bzr switch integration
bzr merge ..\featureA
bzr commit
All of these bzr operations should run fast for a large project except
the initial branch and co (a few seconds for a switch, 1 second for
local branch, etc.).
Tom
More information about the bazaar
mailing list