← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to fetch_ghosts.py

  • Committer: Aaron Bentley
  • Date: 2007-06-12 22:09:44 UTC
  • mfrom: (540.1.2 bzrtools-0.17)
  • Revision ID: aaron.bentley@utoronto.ca-20070612220944-5zw4hlzp1ctq6mkl
Merge fixes from 0.17

Show diffs side-by-side

added added

removed removed

Lines of Context:
fetch_ghosts.py
29
29
    installed = []
30
30
    failed = []
31
31
    lock_other = this_branch.base != other_branch.base
32
 
    
 
32
 
33
33
    this_branch.lock_write()
34
34
    try:
35
35
        if lock_other:
65
65
    if not no_fix and len(installed) > 0:
66
66
        from bzrlib.builtins import cmd_reconcile
67
67
        cmd_reconcile().run(".")
68
 
        
 
68
 
69
69
def iter_ghosts(branch):
70
70
    """Find all ancestors that aren't stored in this branch."""
71
71
    seen = set()