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.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.4 KB |
|
|
|
test_bound_sftp.py |
1997.1.5 | 19 years ago | Robert Collins | ``Branch.bind(other_branch)`` no longer takes a wr | 14.1 KB |
|
|
|
test_branch.py |
2004.1.25 | 19 years ago | v.ladeuil+lp at free | Shuffle http related test code. Hopefully it ends | 25.3 KB |
|
|
|
test_break_lock.py |
2052.3.1 | 19 years ago | John Arbash Meinel | Add tests to cleanup the copyright of all source f | 3.4 KB |
|
|
|
test_http.py |
2004.1.25 | 19 years ago | v.ladeuil+lp at free | Shuffle http related test code. Hopefully it ends | 2.6 KB |
|
|
|
test_locking.py |
1711.8.7 | 19 years ago | John Arbash Meinel | Renaming LockHelpers.py to lock_helpers.py | 8.4 KB |
|
|
|
test_parent.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 3.1 KB |
|
|
|
test_permissions.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.8 KB |
|
|
|
test_pull.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.4 KB |
|
|
|
test_update.py |
2052.3.2 | 19 years ago | John Arbash Meinel | Change Copyright .. by Canonical to Copyright ... | 2.7 KB |
|
|