← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testbranch.py

  • Committer: Martin Pool
  • Date: 2005-08-25 05:58:05 UTC
  • mfrom: (974.1.36)
  • Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:

  * When merging, pull in all missing revisions from the source
    branch. 

  * Detect common ancestors by looking at the whole ancestry graph, 
    rather than just mainline history.

  Some changes to reconcile this with parallel updates to the test and
  trace code.

aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testbranch.py
33
33
TEST_CLASSES = [
34
34
    TestAppendRevisions,
35
35
    ]
 
36
 
 
37
 
 
38
 
 
39
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
 
40
#         >>> from bzrlib.commit import commit
 
41
#         >>> bzrlib.trace.silent = True
 
42
#         >>> br1 = ScratchBranch(files=['foo', 'bar'])
 
43
#         >>> br1.add('foo')
 
44
#         >>> br1.add('bar')
 
45
#         >>> commit(br1, "lala!", rev_id="REVISION-ID-1", verbose=False)
 
46
#         >>> br2 = ScratchBranch()
 
47
#         >>> br2.update_revisions(br1)
 
48
#         Added 2 texts.
 
49
#         Added 1 inventories.
 
50
#         Added 1 revisions.
 
51
#         >>> br2.revision_history()
 
52
#         [u'REVISION-ID-1']
 
53
#         >>> br2.update_revisions(br1)
 
54
#         Added 0 revisions.
 
55
#         >>> br1.text_store.total_size() == br2.text_store.total_size()
 
56
#         True