To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- 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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1852.9.7 | 19 years ago | Robert Collins | Merge bzr.dev. | 3.2 KB |
|
|
|
test_basis_inventory.py |
1910.2.2 | 19 years ago | Aaron Bentley | Tweak test case | 3.3 KB |
|
|
|
test_break_lock.py |
1687.1.15 | 19 years ago | Robert Collins | Review comments. | 2.8 KB |
|
|
|
test_changes_from.py |
1852.9.6 | 19 years ago | Robert Collins | Merge the change from Tree.compare to Tree.changes | 2.2 KB |
|
|
|
test_commit.py |
1927.2.1 | 19 years ago | Robert Collins | Alter set_pending_merges to shove the left most me | 8.1 KB |
|
|
|
test_executable.py |
1852.6.6 | 19 years ago | Robert Collins | Finish updating iter_entries change to make all te | 6.4 KB |
|
|
|
test_get_parent_ids.py |
1927.2.1 | 19 years ago | Robert Collins | Alter set_pending_merges to shove the left most me | 2.6 KB |
|
|
|
test_is_control_filename.py |
1773.4.1 | 19 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 1.7 KB |
|
|
|
test_is_ignored.py |
1836.1.31 | 19 years ago | John Arbash Meinel | Make set_user_ignores a private function, and upda | 7.8 KB |
|
|
|
test_locking.py |
1852.4.6 | 19 years ago | Robert Collins | Review feedback. | 6.3 KB |
|
|
|
test_pull.py |
1773.4.1 | 19 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 2.2 KB |
|
|
|
test_workingtree.py |
1927.2.1 | 19 years ago | Robert Collins | Alter set_pending_merges to shove the left most me | 27.8 KB |
|
|