Question about features

[Tom Widmer]

Daniel Carrera wrote:
> Stephen J. Turnbull wrote:
>> Daniel Carrera writes:
>>
>>  > A problem I'm having is that Bazaar distinguishes between a branch, 
>> a  > tree, a checkout, and a repository. That's four different terms. 
>> I come  > from the simpler world of darcs where "branch = working 
>> directory" and  > that's it.
>>
>> You can work that way in Bazaar, but your particular workflow
>> (frequently using obliterate) is poorly supported (basically for the
>> reasons Ben Finney presents; the Bazaar developers mostly agree with
>> him, although there are a variety of rationales among them).
> 
> We might have a misunderstanding. I don't need to use "obliterate". 
> That's just a shortcut for "uncommit + revert". What I do use often is 
> uncommitting a patch other than the most recent one.

Bazaar is quite bad at history editing of this kind I think. It's very 
hard to uncommit changes that have already been incorporated into other 
branches/looms/pipelines. Really, you just need to make another commit 
that corrects the problem.

Bzr Rebase is the sum-total of built-in history rewriting support I 
think: http://bazaar-vcs.org/Rebase . Unfortunately, I don't think this 
supports rebasing backwards as such, which is what you need to be able 
to uncommit changes that have already been branched from.

>>  > All in all, this seems like a lot of complication when all i want 
>> is to  > uncommit feature A.
>>
>> Yes.  You really want pipelines (maybe looms), not branches.
> 
> Thanks for the info. I'll attempt to educate myself about pipelines and 
> looms.

Note that both of these will tend to keep the history of all your 
experiments, which you seemed to want to avoid.

BTW, Git has good history editing support.

Tom