To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Jan Hudec
- Date: 2006-11-25 20:38:39 UTC
- mto: (2199.1.1 jam-integration)
- Revision ID: bulb@ucw.cz-20061125203839-9nuhv32z63hb8811
Option --pull for merge command.
Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.
Simple test for this option is included.
Option --pull was added to merge command, that, if the merge would be
trivial, ie. if the common ancestor is equal to the local tip, causes pull of
the remote instead of creating the merger.
Simple test for this option is included.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
2052.3.10 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2079 | 3.7 KB |
|
|
|
test_basis_inventory.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 4.2 KB |
|
|
|
test_break_lock.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 2.8 KB |
|
|
|
test_changes_from.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 2.2 KB |
|
|
|
test_commit.py |
1908.7.11 | 19 years ago | Robert Collins | Merge bzr.dev and undeprecated WorkingTree.last_re | 9.8 KB |
|
|
|
test_executable.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 6.4 KB |
|
|
|
test_flush.py |
2052.3.10 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2079 | 2.6 KB |
|
|
|
test_get_parent_ids.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 2.4 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 |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 7.8 KB |
|
|
|
test_locking.py |
1986.5.7 | 19 years ago | Robert Collins | Merge reviews. | 11.8 KB |
|
|
|
test_merge_from_branch.py |
1979.2.1 | 19 years ago | Robert Collins | (robertc) adds a convenience method "merge_from_br | 2.2 KB |
|
|
|
test_mkdir.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 1.3 KB |
|
|
|
test_parents.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 9.3 KB |
|
|
|
test_pull.py |
1908.7.6 | 19 years ago | Robert Collins | Deprecate WorkingTree.last_revision. | 2.2 KB |
|
|
|
test_put_file.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 1.5 KB |
|
|
|
test_read_working_inventory.py |
2052.3.10 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2079 | 1.6 KB |
|
|
|
test_set_root_id.py |
2052.3.10 | 19 years ago | John Arbash Meinel | [merge] bzr.dev 2079 | 2.4 KB |
|
|
|
test_unversion.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.1 KB |
|
|
|
test_workingtree.py |
1731.1.48 | 19 years ago | Aaron Bentley | Merge from bzr.dev | 28.6 KB |
|
|