← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Martin Pool
  • Date: 2005-09-13 01:41:00 UTC
  • Revision ID: mbp@sourcefrog.net-20050913014100-1385f2cc25d9259f
- comment out tests that don't pass with weave storage at the moment

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
702
702
        >>> sb = ScratchBranch(files=['foo', 'foo~'])
703
703
        >>> sb.common_ancestor(sb) == (None, None)
704
704
        True
705
 
        >>> commit.commit(sb, "Committing first revision", verbose=False)
 
705
        >>> commit.commit(sb, "Committing first revision")
706
706
        >>> sb.common_ancestor(sb)[0]
707
707
        1
708
708
        >>> clone = sb.clone()
709
 
        >>> commit.commit(sb, "Committing second revision", verbose=False)
 
709
        >>> commit.commit(sb, "Committing second revision")
710
710
        >>> sb.common_ancestor(sb)[0]
711
711
        2
712
712
        >>> sb.common_ancestor(clone)[0]
713
713
        1
714
 
        >>> commit.commit(clone, "Committing divergent second revision", 
715
 
        ...               verbose=False)
 
714
        >>> commit.commit(clone, "Committing divergent second revision")
716
715
        >>> sb.common_ancestor(clone)[0]
717
716
        1
718
717
        >>> sb.common_ancestor(clone) == clone.common_ancestor(sb)