/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Adeodato Simó
  • Date: 2006-07-21 17:00:07 UTC
  • mto: (1711.2.106 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1905.
  • Revision ID: dato@net.com.org.es-20060721170007-bea76c69779e80e8
cmd_commit.run:
    - improve error message for BoundBranchOutOfDate.

cmd_update.run:
    - print a note if local commits are now a pending merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
826
826
            conflicts = tree.update()
827
827
            revno = tree.branch.revision_id_to_revno(tree.last_revision())
828
828
            note('Updated to revision %d.' % (revno,))
 
829
            if tree.pending_merges():
 
830
                note('Your local commits will show now as pending merges with '
 
831
                     '`bzr status`, and can be commited with `bzr commit`.')
829
832
            if conflicts != 0:
830
833
                return 1
831
834
            else:
1754
1757
            raise BzrCommandError("Commit refused because there are unknown "
1755
1758
                                  "files in the working tree.")
1756
1759
        except errors.BoundBranchOutOfDate, e:
1757
 
            raise BzrCommandError(str(e)
1758
 
                                  + ' Either unbind, update, or'
1759
 
                                    ' pass --local to commit.')
 
1760
            raise BzrCommandError(str(e) + "\n"
 
1761
                'To commit to master branch, do update and then commit, or '  \
 
1762
                'push if the branches have not diverged.\nYou can also pass ' \
 
1763
                '--local to commit to continue working offline.')
1760
1764
 
1761
1765
 
1762
1766
class cmd_check(Command):