[RFC] bound branches initial ui

[Martin Pool]

On Wed, 2006-02-22 at 21:14 +1100, Robert Collins wrote:
> On Wed, 2006-02-22 at 19:05 +1100, Martin Pool wrote:
> > 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.
> 
> pivoting occurs on commit, so no, we haven't pivoted. I'd *like* us to
> be able to do that, but its a much greater change and not one we can do
> sanely for 0.8 IMO.

OK

-- 
Martin

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060224/de7c6841/attachment.pgp