tests/test-hghave.t
author Sergey Kishchenko <voidwrk@gmail.com>
Tue, 25 Sep 2012 20:50:40 +0300
changeset 17668 28c43957f8b4
parent 12430 60738066e37a
child 25472 4d2b9b304ad0
permissions -rw-r--r--
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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12430
60738066e37a tests: unify test-hghave
Matt Mackall <mpm@selenic.com>
parents: 8059
diff changeset
     1
Testing that hghave does not crash when checking features
8059
41a2c5cbcb6a hghave: checking that all targets are Exception-free
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
diff changeset
     2
12430
60738066e37a tests: unify test-hghave
Matt Mackall <mpm@selenic.com>
parents: 8059
diff changeset
     3
  $ "$TESTDIR/hghave" --test-features 2>/dev/null