← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_smart_add.py

Committer: Martin Pool
Date: 2005-09-12 08:21:24 UTC
mfrom: (974.1.74)
mto: (1092.2.12) (974.1.76) (1185.8.2)
mto: This revision was merged to the branch mainline in revision 1390.
Revision ID: mbp@sourcefrog.net-20050912082124-c6b174bd5d971cc0

- merge improved merge base selection from aaron
aaron.bentley@utoronto.ca-20050912025534-43d7275dd948e4ad

files added:
bzrlib/graph.py

bzrlib/selftest/testgraph.py

bzrlib/selftest/testmerge.py

files modified:
bzrlib/branch.py

bzrlib/revision.py

bzrlib/selftest/__init__.py

bzrlib/selftest/blackbox.py

bzrlib/selftest/testrevision.py

Show diffs side-by-side

added added

removed removed

bzrlib/selftest/test_smart_add.py

Older »