~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-04-08 07:24:21 UTC
  • mfrom: (5765.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20110408072421-81nrdsapywozyyft
(spiv) Update the PointlessCommit error message. [a=Federico Culloca] (John
 A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
3273
3273
                        exclude=tree.safe_relpath_files(exclude))
3274
3274
        except PointlessCommit:
3275
3275
            raise errors.BzrCommandError("No changes to commit."
3276
 
                              " Use --unchanged to commit anyhow.")
 
3276
                " Please 'bzr add' the files you want to commit, or use"
 
3277
                " --unchanged to force an empty commit.")
3277
3278
        except ConflictsInTree:
3278
3279
            raise errors.BzrCommandError('Conflicts detected in working '
3279
3280
                'tree.  Use "bzr conflicts" to list, "bzr resolve FILE" to'