/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: Robert Collins
  • Date: 2009-03-16 05:08:19 UTC
  • mfrom: (4147 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4149.
  • Revision ID: robertc@robertcollins.net-20090316050819-unhkpvsvu3mzaore
NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3387
3387
            basis_tree = tree.revision_tree(tree.last_revision())
3388
3388
        except errors.NoSuchRevision:
3389
3389
            basis_tree = tree.basis_tree()
3390
 
        changes = tree.changes_from(basis_tree)
3391
 
        if changes.has_changed():
3392
 
            raise errors.UncommittedChanges(tree)
 
3390
        if not force:
 
3391
            changes = tree.changes_from(basis_tree)
 
3392
            if changes.has_changed():
 
3393
                raise errors.UncommittedChanges(tree)
3393
3394
 
3394
3395
        view_info = _get_view_info_for_change_reporter(tree)
3395
3396
        change_reporter = delta._ChangeReporter(