/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: Roberto Aguilar
  • Date: 2009-02-27 06:57:18 UTC
  • mto: (4090.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 4092.
  • Revision ID: roberto.c.aguilar@gmail.com-20090227065718-0nisn2xlrfc8zdjl
Set check_basis to False.

Instead of inverting what was there, actually make the check for uncommitted
changes False

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3422
3422
                                       merger.other_rev_id)
3423
3423
                    result.report(self.outf)
3424
3424
                    return 0
3425
 
            merger.check_basis(force)
 
3425
            merger.check_basis(False)
3426
3426
            if preview:
3427
3427
                return self._do_preview(merger)
3428
3428
            else: