← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/versionedfile.py

  • Committer: Aaron Bentley
  • Date: 2006-04-17 22:59:11 UTC
  • mto: This revision was merged to the branch mainline in revision 1672.
  • Revision ID: aaron.bentley@utoronto.ca-20060417225911-2465ef6f4183b4fb
Added legend for plan-merge output

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/versionedfile.py
400
400
        base.
401
401
 
402
402
        Weave lines present in none of them are skipped entirely.
 
403
 
 
404
        Legend:
 
405
        killed-base Dead in base revision
 
406
        killed-both Killed in each revision
 
407
        killed-a    Killed in a
 
408
        killed-b    Killed in b
 
409
        unchanged   Alive in both a and b (possibly created in both)
 
410
        new-a       Created in a
 
411
        new-b       Created in b
 
412
        ghost-a     ??     
 
413
        ghost-b     ??
 
414
        irrelevant  Not in either revision
403
415
        """
404
416
        inc_a = set(self.get_ancestry([ver_a]))
405
417
        inc_b = set(self.get_ancestry([ver_b]))