Bzr commit on a diverged checkout should suggest push alongside update

Bug #566271 reported by Maciej Katafiasz
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Medium
Unassigned

Bug Description

Consider this scenario, just taken from #bzr:

$ bzr co bzr://remote/branch
# hack hack hack
$ bzr commit --local
$ bzr commit
bzr: ERROR: Bound branch BzrBranch7('file:///tmp/checkout/') is out of date with master branch RemoteBranch(bzr://remote/branch/).
To commit to master branch, run update and then commit.
You can also pass --local to commit to continue working disconnected.

What the user actually intended is bzr push, because bzr commit will roll up all the commits into a merge, which is rarely intended. Thus the error message should suggest using push as much as, or maybe more than, update.

Martin Pool (mbp)
Changed in bzr:
importance: Undecided → Medium
status: New → Confirmed
Jelmer Vernooij (jelmer)
tags: added: update
tags: removed: update
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.