Mercurial: tests/README@28c43957f8b4 (annotated)

resolve: commit the changes after each item resolve (issue3638) At the moment the resolve command doesn't save progress during the resolve process. In example if you try to resolve 100 conflicting files and interrupt the process (e.g., you close the external merge tool) after resolving 50 files you'll end up with 100 unresolved conflicts. Saving the progress helps a lot with long going merges. It's easy to achieve same behavior with simple script that calls resolve command for each unresolved file but it makes sense to make such behavior a default

332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	1	To run the tests, do:
6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	2
6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	3	cd tests/
2207 8a2a7f7d9df6 Delete the shell version of run-tests Stephen Darnell <stephen@darnell.plus.com> parents: 1933 diff changeset	4	python run-tests.py
332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	5
8936 1de6e7e1bb9f change wiki/bts URLs to point to new hostname Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 3934 diff changeset	6	See http://mercurial.selenic.com/wiki/WritingTests for
3934 d0bbd8ee50c7 Move test suite docs to the wiki Matt Mackall <mpm@selenic.com> parents: 3199 diff changeset	7	more information on writing tests.

author	Sergey Kishchenko <voidwrk@gmail.com>
	Tue, 25 Sep 2012 20:50:40 +0300
changeset 17668	28c43957f8b4
parent 8936	1de6e7e1bb9f
child 26421	4b0fc75f9403
permissions	-rw-r--r--