- Committer: Robert Collins
- Date: 2006-08-17 03:35:26 UTC
- mto: (1908.5.8 combine set_last_revision and set_pending_merges.)
- Revision ID: robertc@robertcollins.net-20060817033526-d36c591bf3d93152
Alter set_pending_merges to shove the left most merge into the trees last-revision if that is not set. Related bugfixes include basis_tree handling ghosts, de-duping the merges with the last-revision and update changing where and how it adds its pending merge.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
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 |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
1861.2.1 | 18 years ago | Alexander Belchenko | merged installer work | 466 bytes |
|
|
|
.rsyncexclude |
1185.33.36 | 19 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
1711.2.122 | 18 years ago | John Arbash Meinel | Remove bogus entry from BRANCH.TODO | 147 bytes |
|
|
|
build-api |
1185.33.32 | 19 years ago | Martin Pool | [merge] fix \t in commit messages | 100 bytes |
|
|
bzr |
1912.1.2 | 18 years ago | Martin Pool | Update version to 0.10dev | 2.6 KB |
|
|
|
bzr.ico |
1861.2.16 | 18 years ago | Alexander Belchenko | new official bzr.ico | 7.2 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
generate_docs.py |
1861.2.7 | 18 years ago | Alexander Belchenko | merge bzr.dev | 2.9 KB |
|
|
|
HACKING |
1861.2.20 | 18 years ago | Alexander Belchenko | English | 18.8 KB |
|
|
|
INSTALL |
1185.16.80 | 19 years ago | Martin Pool | Update news and readme - better explanation of de | 437 bytes |
|
|
|
Makefile |
1912.4.1 | 18 years ago | Alexander Belchenko | generate_docs.py should be invoked with python int | 2.2 KB |
|
|
|
NEWS |
1927 | 18 years ago | Canonical.com Patch Queue Manager | (jam) add '--file-ids-from' to 'bzr add' (bug #557 | 63.1 KB |
|
|
|
NEWS.developers |
1185.16.35 | 19 years ago | Martin Pool | - stub for revision properties | 910 bytes |
|
|
|
profile_imports.py |
1724.2.14 | 18 years ago | John Arbash Meinel | Refactor import stuff into separate functions. Upd | 4.9 KB |
|
|
|
README |
1610.1.9 | 18 years ago | Martin Pool | Update version numbers | 808 bytes |
|
|
|
setup.py |
1911.1.1 | 18 years ago | Alexander Belchenko | setup.py: need to install data files for selftest | 7.1 KB |
|
|
|
TODO |
1185.82.134 | 18 years ago | Aaron Bentley | Merge from bzr.dev | 15.7 KB |
|
|