~bzr-pqm/bzr/bzr.dev

  • 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

Filename Latest Rev Last Changed Committer Comment Size
..
convertfile.py 942 19 years ago Martin Pool - update convertinv to work with current weave cod 2.1 KB Diff Download File
convertinv.py 893 19 years ago Martin Pool - Refactor weave calculation of inclusions 2 KB Diff Download File
history2revfiles.py 1110 19 years ago Martin Pool - merge aaron's merge improvements: * When merg 2.8 KB Diff Download File
history2weaves.py 1089 19 years ago Martin Pool - better progress messages for conversion to weave 4 KB Diff Download File
http_client.py 1093 19 years ago Martin Pool - more experiments with http_client 15 KB Diff Download File
testweave.py 1083 19 years ago Martin Pool - add space to store revision-id in weave files 20.7 KB Diff Download File
weavebench.py 936 19 years ago Martin Pool - weavebench should set random seed to make it rep 2.6 KB Diff Download File
weavemerge.sh 921 19 years ago Martin Pool - shell script to set up a weave merge test case 584 bytes Diff Download File