~bzr-pqm/bzr/bzr.dev

  • Committer: Martin Pool
  • Date: 2005-07-05 08:09:30 UTC
  • Revision ID: mbp@sourcefrog.net-20050705080929-f44361a66a8b2e29
- Merge3.find_sync_regions always returns a zero-length sentinal at the end to
  ease matching.

- Merge3.merge partially done.
Filename Latest Rev Last Changed Committer Comment Size
..
__init__.py 822 19 years ago Martin Pool - Renamed merge3 test suite for easier access. - 9 KB Diff Download File
blackbox.py 785 19 years ago Martin Pool - add test for external revert command 11.3 KB Diff Download File
plugins.py 750 19 years ago Martin Pool - stubbed-out tests for python plugins 2.5 KB Diff Download File
testmerge3.py 825 19 years ago Martin Pool - Merge3.find_sync_regions always returns a zero-l 4.4 KB Diff Download File
versioning.py 754 19 years ago Martin Pool - new check for attempting to add a file in an unv 2 KB Diff Download File
whitebox.py 818 19 years ago Martin Pool - Clear pending-merge list when committing. 6.3 KB Diff Download File