- Committer: Vincent Ladeuil
- Date: 2009-10-16 16:31:24 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- Revision ID: v.ladeuil+lp@free.fr-20091016163124-zeitc3cilvvwm9xd
Tests passing for a minimal --interactive implementation.
* bzrlib/tests/test_conflicts.py:
(TestResolveDuplicatePaths.test_resolve_keeping_this,
TestResolveDuplicatePaths.test_resolve_keeping_other): Use better
action names.
* bzrlib/tests/blackbox/test_conflicts.py:
(TestResolve.test_resolve_interactive): Fix failing test by
providing an exiting action.
* bzrlib/conflicts.py:
(_resolve_interactive): Minimal implementation.
* bzrlib/tests/test_conflicts.py:
(TestResolveDuplicatePaths.test_resolve_keeping_this,
TestResolveDuplicatePaths.test_resolve_keeping_other): Use better
action names.
* bzrlib/tests/blackbox/test_conflicts.py:
(TestResolve.test_resolve_interactive): Fix failing test by
providing an exiting action.
* bzrlib/conflicts.py:
(_resolve_interactive): Minimal implementation.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
man1
|
2425.1.1 | 17 years ago | Robert Collins | ``make docs`` now creates a man page at ``man1/bzr |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
4679.3.76 | 15 years ago | John Arbash Meinel | Rename StaticTupleInterner => SimpleSet. This is | 1.2 KB |
|
|
|
.rsyncexclude |
1185.33.36 | 18 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
4325.3.4 | 15 years ago | Johan Walles | Merge from upstream. | 150 bytes |
|
|
bzr |
4746.1.2 | 15 years ago | John Arbash Meinel | Merge in the 2.0 series, resolve the NEWS issues m | 5.6 KB |
|
|
|
bzr.ico |
3688.3.3 | 16 years ago | John Arbash Meinel | An updated transparent icon for bzr. | 12.7 KB |
|
|
|
COPYING.txt |
1861.2.9 | 18 years ago | Alexander Belchenko | rename gpl.txt => COPYING.txt | 17.5 KB |
|
|
|
INSTALL |
2696.2.4 | 17 years ago | Aaron Bentley | Fix typo | 1.4 KB |
|
|
|
Makefile |
4736.2.1 | 15 years ago | John Arbash Meinel | Start adding the .h files to the release tarballs | 14.5 KB |
|
|
|
NEWS |
4746.1.2 | 15 years ago | John Arbash Meinel | Merge in the 2.0 series, resolve the NEWS issues m | 397 KB |
|
|
|
Outline.txt |
4597.3.19 | 15 years ago | Vincent Ladeuil | Some failing tests. * bzrlib/tests/test_conflicts | 5.5 KB |
|
|
|
profile_imports.py |
4183.7.1 | 15 years ago | Sabin Iacob | update FSF mailing address | 5.5 KB |
|
|
|
README |
4634.65.1 | 15 years ago | Ian Clatworthy | update for 2.0 | 2.2 KB |
|
|
|
setup.py |
4679.5.3 | 15 years ago | John Arbash Meinel | Bring in the latest 'simple-set' code. This is ju | 27 KB |
|
|
|
TODO |
2382.2.5 | 17 years ago | Martin Pool | Contents of TODO file moved into bug tracker | 115 bytes |
|
|