← 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: 2006-06-18 01:24:25 UTC
  • mfrom: (0.3.3 shelf-dev)
  • Revision ID: aaron.bentley@utoronto.ca-20060618012425-61c3d9d62a2cc971
Merged the latest Shelf changes, patches.py no longer needed.

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()