[RFC] bound branches initial ui

[Martin Pool]

On 22 Feb 2006, Robert Collins <robertc at robertcollins.net> wrote:
> You should have the option to do the following:
> $ bzr commit
> ERROR: Out of date branch: Your branch is out of date with the master
> branch, you need to update before you can perform a commit. If you have
> uncommitted changes consider running 'bzr commit --local' before
> updating.
> $ bzr commit --local -m 'Preparing to update'
> Committed local revision 4
> $ bzr update
> > Assuming no conflicts:
> You have local commits. Please run 'bzr commit' to send your local
> commits to the master, or 'bzr commit --local' to record that you are
> now up to date with the master.

OK, so at this point I have pivoted my revision history to be that of
the master, and the previous local commits are shown as pending.  If I
run bzr status now I'll see those pending merges.  If I run bzr diff
I'll see a diff of *all my changes* from the current master tip.

> > With conflicts:
> Conflicts detected:
> ...
> You have local commits. Please resolve the conflicts and then run 'bzr
> commit' to send your local commits to the master, or 'bzr commit
> --local' to record that you are now up to date with the master.

So the only difference is in the message, and in whether there are
conflict markers or not?

?
-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060222/146575ae/attachment.pgp