uncommit and bound branches

[Martin Pool]

On 06/05/2006, at 1:26 AM, John Arbash Meinel wrote:

> Erik Bågfors wrote:
>> Try the following
>>
>> bzr checkout foo bar
>> cd bar
>> bzr ci --local --unchanged -m 1
>> bzr uncommit
>>
>> it fails with out of date.  I would expect this to only uncommit
>> locally. Can this be considered a bug?
>>
>> /Erik
>
> There has been a discussion about how uncommit should work with bound
> branches. I think since we have 'commit --local', we probably want
> 'uncommit --local'.

That sounds reasonable.

There is some asymmetry: after a local commit, pushing will put the  
master branch back in sync with you.  If you uncommitted, you will  
need to push --overwrite.  That should possibly be mentioned in the  
help.

-- 
Martin