← 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-10 01:48:19 UTC
  • Revision ID: mbp@sourcefrog.net-20050610014819-a91279fc99597155
- bzr pull should not check that the tree is clean
  (from aaron)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
426
426
        except DivergedBranches:
427
427
            raise BzrCommandError("These branches have diverged.  Try merge.")
428
428
            
429
 
        merge(('.', -1), ('.', old_revno))
 
429
        merge(('.', -1), ('.', old_revno), check_clean=False)
430
430
        if location != stored_loc:
431
431
            br_to.controlfile("x-pull", "wb").write(location + "\n")
432
432