← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2005-12-31 00:23:03 UTC
  • mto: (1587.1.6 bound-branches)
  • mto: This revision was merged to the branch mainline in revision 1590.
  • Revision ID: john@arbash-meinel.com-20051231002303-fbc5cf80469ef0cf
Updated commit to handle bound branches. Included test to handle commit after merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1325
1325
        except StrictCommitFailed:
1326
1326
            raise BzrCommandError("Commit refused because there are unknown "
1327
1327
                                  "files in the working tree.")
 
1328
        except errors.BoundBranchOutOfDate, e:
 
1329
            raise BzrCommandError(str(e)
 
1330
                                  + ' Either unbind or update.')
1328
1331
 
1329
1332
        note('Committed revision %d.' % (tree.branch.revno(),))
1330
1333