- Committer: Canonical.com Patch Queue Manager
- Date: 2010-11-18 19:09:18 UTC
- mfrom: (5540.1.7 bug483388-criss-cross-null-base)
- Revision ID: pqm@pqm.ubuntu.com-20101118190918-33ysfcqtzq6g0mki
Make merge correctly locate a lca where there is a criss-cross merge
of a new root.
of a new root.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
apport
|
4797.33.16 | 14 years ago | Robert Collins | Update bugfix for 528114 to trunk. |
|
||
|
bzrlib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
man1
|
2425.1.1 | 17 years ago | Robert Collins | ``make docs`` now creates a man page at ``man1/bzr |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
5462.5.3 | 14 years ago | Andrew Bennetts | Keep docs-plain working. | 1.2 KB |
|
|
|
.rsyncexclude |
1185.33.36 | 19 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
.testr.conf |
5060.2.1 | 14 years ago | Robert Collins | * bzr now has a ``.testr.conf`` file in its source | 93 bytes |
|
|
|
BRANCH.TODO |
5340.8.6 | 14 years ago | Marius Kruger | * Update documentation * add NEWS | 150 bytes |
|
|
bzr |
5473.1.1 | 14 years ago | Vincent Ladeuil | Merge 2.2 into trunk including fixes for bug #6517 | 5.2 KB |
|
|
|
bzr.ico |
3688.3.3 | 16 years ago | John Arbash Meinel | An updated transparent icon for bzr. | 12.7 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
INSTALL |
5278.1.5 | 14 years ago | Martin Pool | Correct more sloppy use of the term 'Linux' | 1.4 KB |
|
|
|
Makefile |
5498.1.2 | 14 years ago | Martin Pool | Superstitious argument quoting in makefile | 14.9 KB |
|
|
|
MANIFEST.in |
4634.125.2 | 14 years ago | John Arbash Meinel | Update the MANIFEST.in file. | 118 bytes |
|
|
|
NEWS |
5462.5.1 | 14 years ago | Andrew Bennetts | Split NEWS into per-release doc/en/release-notes/b | 141 bytes |
|
|
|
profile_imports.py |
5027 | 14 years ago | Canonical.com Patch Queue Manager | (mbp) add import-tariff tests | 6.1 KB |
|
|
|
README |
5447.2.1 | 14 years ago | Vincent Ladeuil | Fix some typos and propose a release planning. | 2.2 KB |
|
|
|
README_BDIST_RPM |
4634.125.1 | 14 years ago | Joe Julian | Added MANIFEST.in to allow bdist_rpm to have all t | 397 bytes |
|
|
|
setup.py |
4597.9.22 | 14 years ago | Vincent Ladeuil | Merge cleanup into reports-conflict-resolved | 28.4 KB |
|
|
|
TODO |
4634.146.5 | 14 years ago | Danny van Heumen | Reverted now-useless TODO list. | 115 bytes |
|
|