← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Martin Pool
  • Date: 2005-06-20 01:32:42 UTC
  • Revision ID: mbp@sourcefrog.net-20050620013242-43d80bc8432f6218
- bzr branch shouldn't say "0 conflicts"

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
572
572
                                                         revision)
573
573
            raise BzrCommandError(msg)
574
574
        merge((to_location, -1), (to_location, 0), this_dir=to_location,
575
 
              check_clean=False)
 
575
              check_clean=False, ignore_zero=True)
576
576
        from_location = pull_loc(br_from)
577
577
        br_to.controlfile("x-pull", "wb").write(from_location + "\n")
578
578