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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
index-plain.txt |
4634.39.36 | 16 years ago | Ian Clatworthy | Get plain-style documentation generation working a | 2.8 KB |
|
|
|
index.txt |
4634.39.13 | 16 years ago | Ian Clatworthy | PDF generation for Spanish docs | 2.8 KB |
|
|
|
resolving_conflicts.txt |
3405.2.11 | 17 years ago | Martin Albisetti | * Added Makefile for spanish docs * Created the | 7.2 KB |
|
|
|
version_info.txt |
3405.2.3 | 17 years ago | Martin Albisetti | Added version info translation to spanish | 2 KB |
|
|