- 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 | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1 | 19 years ago | mbp at sourcefrog | import from baz patch-364 |
|
||
|
contrib
|
331 | 19 years ago | Martin Pool | - sketchy experiments in bash and zsh completion |
|
||
|
doc
|
6 | 19 years ago | mbp at sourcefrog | import all docs from arch |
|
||
|
notes
|
10 | 19 years ago | mbp at sourcefrog | import more files from baz |
|
||
|
patches
|
520 | 19 years ago | Martin Pool | - add space for un-merged patches |
|
||
|
tools
|
854 | 19 years ago | Martin Pool | - rearrange and clear up merged weave |
|
||
.bzrignore |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 167 bytes |
|
|
|
.rsyncexclude |
363 | 19 years ago | Martin Pool | - do upload CHANGELOG to web server, even though i | 152 bytes |
|
|
|
build-api |
496 | 19 years ago | Martin Pool | - patch from ddaa to create api/ directory befo | 88 bytes |
|
|
|
bzr |
974.1.1 | 19 years ago | Aaron Bentley | Fixed python invocation | 1.5 KB |
|
|
|
bzr-man.py |
635 | 19 years ago | Martin Pool | - manpage generator by Hans Ulrich Niedermann | 7.4 KB |
|
|
|
HACKING |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 3 KB |
|
|
|
Makefile |
1102 | 19 years ago | Martin Pool | - merge test refactoring from robertc More of t | 59 bytes |
|
|
|
NEWS |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 11.4 KB |
|
|
|
README |
966 | 19 years ago | Martin Pool | - now needs python 2.4 - update instructions for r | 1.3 KB |
|
|
|
setup.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 699 bytes |
|
|
|
testbzr |
736 | 19 years ago | Martin Pool | - move old blackbox code from testbzr into bzrlib. | 845 bytes |
|
|
|
testsweet.py |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 10.2 KB |
|
|
|
TODO |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 17 KB |
|
|
|
tutorial.txt |
1110 | 19 years ago | Martin Pool | - merge aaron's merge improvements: * When merg | 10 KB |
|
|