~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
..
inventory-v2-sample.xml 1085 19 years ago Martin Pool - add schema and example for new inventory form 275 bytes Diff Download File
inventory-v2.rnc 1085 19 years ago Martin Pool - add schema and example for new inventory form 491 bytes Diff Download File
new-inventory-sample.xml 149 19 years ago mbp at sourcefrog experiment with new nested inventory file format n 19.8 KB Diff Download File
performance.txt 149 19 years ago mbp at sourcefrog experiment with new nested inventory file format n 9.2 KB Diff Download File
revfile.txt 1110 19 years ago Martin Pool - merge aaron's merge improvements: * When merg 1.1 KB Diff Download File
schemas.xml 1085 19 years ago Martin Pool - add schema and example for new inventory form 178 bytes Diff Download File