To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Vincent Ladeuil
- Date: 2009-10-19 17:04:52 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20091019170452-xtm6l6411trwca4o
Implement --interactive for ParentLoop.
* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop): Tests for --interactive.
* bzrlib/conflicts.py:
(ParentLoop): Add actions for --interactive. Presumably the
conflcit itself should have more info about the involved paths.
* bzrlib/tests/test_conflicts.py:
(TestResolveParentLoop): Tests for --interactive.
* bzrlib/conflicts.py:
(ParentLoop): Add actions for --interactive. Presumably the
conflcit itself should have more info about the involved paths.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
org
|
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
__init__.py |
1185.1.29 | 20 years ago | Robert Collins | merge merge tweaks from aaron, which includes late | 55 bytes |
|
|