- 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
* 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 3 KB |
|
|
|
blackbox.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 13 KB |
|
|
|
plugins.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 2.7 KB |
|
|
|
testbranch.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 1.9 KB |
|
|
|
testdiff.py |
1102 | 19 years ago | Martin Pool | - merge test refactoring from robertc More of t | 1.8 KB |
|
|
|
testhashcache.py |
1102 | 19 years ago | Martin Pool | - merge test refactoring from robertc More of t | 3.7 KB |
|
|
|
testinv.py |
1102 | 19 years ago | Martin Pool | - merge test refactoring from robertc More of t | 1.9 KB |
|
|
|
testlog.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 3.3 KB |
|
|
|
testmerge3.py |
1102 | 19 years ago | Martin Pool | - merge test refactoring from robertc More of t | 9.8 KB |
|
|
|
testrevision.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 4.9 KB |
|
|
|
testrevisionnamespaces.py |
1102 | 19 years ago | Martin Pool | - merge test refactoring from robertc More of t | 1.7 KB |
|
|
|
teststatus.py |
1102 | 19 years ago | Martin Pool | - merge test refactoring from robertc More of t | 1.5 KB |
|
|
|
versioning.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 4.7 KB |
|
|
|
whitebox.py |
1102 | 19 years ago | Martin Pool | - merge test refactoring from robertc More of t | 7.4 KB |
|
|