- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
annotate3.patch |
645 | 19 years ago | Martin Pool | - split out proposed progress module | 262 KB |
|
|
|
annotate4.patch |
647 | 19 years ago | Martin Pool | - split out updated progress indicator | 262 KB |
|
|
|
cache-remote-revisions.diff |
688 | 19 years ago | Martin Pool | - add deferred patch from abentley to fetch rem | 4.8 KB |
|
|
|
find-touching-from-seq.diff |
631 | 19 years ago | Martin Pool | - add deferred patch for finding touching patches | 2.7 KB |
|
|
|
meta-data-in-inventory.patch |
677 | 19 years ago | Martin Pool | - draft 'meta' command by john | 10.4 KB |
|
|
|
ndiff.patch |
817 | 19 years ago | Martin Pool | - Deferred patch that uses Python ndiff format. | 4.7 KB |
|
|
|
pending-merge.patch |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 4.2 KB |
|
|
|
plugins-no-plugins.patch |
737 | 19 years ago | Martin Pool | - add plugin patch, still being integrated | 18.6 KB |
|
|
|
progress.diff |
647 | 19 years ago | Martin Pool | - split out updated progress indicator | 4.7 KB |
|
|
|
symlink-support.patch |
521 | 19 years ago | Martin Pool | - Add patch to give symlink support | 20.3 KB |
|
|