← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2005-10-06 04:29:10 UTC
  • mfrom: (1185.14.11)
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20051006042910-a3263271389bfdc2
Merged conflict handling work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
999
999
    
1000
1000
    def run(self, message=None, file=None, verbose=True, selected_list=None,
1001
1001
            unchanged=False):
1002
 
        from bzrlib.errors import PointlessCommit
 
1002
        from bzrlib.errors import PointlessCommit, ConflictsInTree
1003
1003
        from bzrlib.msgeditor import edit_commit_message
1004
1004
        from bzrlib.status import show_status
1005
1005
        from cStringIO import StringIO
1007
1007
        b = Branch.open_containing('.')
1008
1008
        if selected_list:
1009
1009
            selected_list = [b.relpath(s) for s in selected_list]
 
1010
 
1010
1011
            
1011
1012
        if not message and not file:
1012
1013
            catcher = StringIO()
1033
1034
            # perhaps prepare the commit; get the message; then actually commit
1034
1035
            raise BzrCommandError("no changes to commit",
1035
1036
                                  ["use --unchanged to commit anyhow"])
 
1037
        except ConflictsInTree:
 
1038
            raise BzrCommandError("Conflicts detected in working tree.  "
 
1039
                'Use "bzr conflicts" to list, "bzr resolve FILE" to resolve.')
1036
1040
 
1037
1041
 
1038
1042
class cmd_check(Command):