To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 4597.3.30.
- Committer: Vincent Ladeuil
- Date: 2009-10-19 14:18:12 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20091019141812-lwxo72eft2nfpzxe
Light changes learned while starting to understand multiple conflicts on
the same path.
* bzrlib/tests/test_conflicts.py:
(TestResolveUnversionedParent): These tests creates multiple
conflicts...
* bzrlib/help_topics/en/conflicts.txt:
Let's call a dir a dir not a file in 'Missing parent' doc.
* bzrlib/conflicts.py:
(_resolve_interactive): Clearer error message.
the same path.
* bzrlib/tests/test_conflicts.py:
(TestResolveUnversionedParent): These tests creates multiple
conflicts...
* bzrlib/help_topics/en/conflicts.txt:
Let's call a dir a dir not a file in 'Missing parent' doc.
* bzrlib/conflicts.py:
(_resolve_interactive): Clearer error message.
expand all
collapse all
added
removed
