Jun Wu
b603929009
mergedriver: fix test caused by upstream change
...
Summary:
Upstream change 3ceac0 removes the `labels` parameter from
`mergestate.*resolve` methods. Let's update our tests.
Test Plan: Run `test-mergedriver.t` with the latest hg
Reviewers: simonfar, #sourcecontrol, ttung, rmcelroy
Reviewed By: rmcelroy
Subscribers: mjpieters
Differential Revision: https://phabricator.fb.com/D3153698
Tasks: 10749152
Signature: t1:3153698:1460071369:bca8f52c2cf730513385afbdd809747386a57027
2016-04-07 16:23:49 -07:00
Durham Goode
d4c8e07f8d
tests: update mergedriver test with output from upstream
2016-02-17 15:22:56 -08:00
Siddharth Agarwal
cde6b3242f
mergedriver: make it clear that artifacts must be regenerated
2016-02-10 00:18:51 -08:00
Siddharth Agarwal
18d788d4c8
mergedriver: remove misleading text from --skip option
2016-02-10 00:14:52 -08:00
Siddharth Agarwal
5d54be8311
mergedriver: unmark driver-resolved files when skipping merge driver
...
Otherwise with `hg resolve --all --skip && hg resolve --mark --all`, people
could get into an unending, confusing loop.
2016-02-10 00:13:35 -08:00
Siddharth Agarwal
6f961dfc3f
test-mergedriver.t: remove XXX that is no longer valid
2016-02-10 00:01:29 -08:00
Mateusz Kwapich
b860a46a63
mergedriver: fix tests
...
Test Plan: tests are passing now.
Reviewers: #sourcecontrol, ttung, sid0
Reviewed By: sid0
Differential Revision: https://phabricator.fb.com/D2913880
Signature: t1:2913880:1454971308:36b95c8b1a952940bd70e147eef0943e1f1a30c5
2016-02-08 14:44:15 -08:00
Durham Goode
e8fde2c226
mergedriver: update tests with simple output change
2016-01-20 13:40:15 -08:00
Laurent Charignon
0ca941a08a
cleanup: use backtick instead of parent to capture output of shell cmd
...
Summary: This diff is part of a series to cleanup fb-hgext and make it pass check-code.
Test Plan: all tests pass
Reviewers: #sourcecontrol, ttung, mitrandir, akushner
Reviewed By: akushner
Subscribers: mpm, akushner, mitrandir
Differential Revision: https://phabricator.fb.com/D2811997
Signature: t1:2811997:1452200059:9e4fca501a22f95d2d9a22d234758f55e292ea9a
2016-01-07 18:30:24 -08:00
Laurent Charignon
5ebc03718c
cleanup: fix quoting patterns in tests
...
Summary: This diff is part of a series to cleanup fb-hgext and make it pass check-code.
Test Plan: All tests pass
Reviewers: #sourcecontrol, ttung
Differential Revision: https://phabricator.fb.com/D2811856
2016-01-07 18:30:24 -08:00
Siddharth Agarwal
a31e5c1096
test-mergedriver.t: update --clean in between failing merges
...
Mercurial changeset e96bb53bb99a changed things so that if there were
unresolved conflicts you could no longer do another merge.
2016-01-03 22:26:32 -08:00
Siddharth Agarwal
ebe6a3b2a1
mergedriver: add an option to resolve to skip merge driver
...
Sometimes the merge driver might be malfunctioning -- it is important to have a
way to skip it so that this can be resolved later.
2015-12-02 22:58:57 -08:00
Siddharth Agarwal
f07f8b307a
mergedriver: don't abort on changed merge driver
...
We want to retain the flexibility of being able to disable the merge driver if
stuff breaks disastrously.
2015-12-02 16:09:14 -08:00
Siddharth Agarwal
3156dfe5a3
mergedriver: ignore failures where the file wasn't found
2015-12-02 14:20:51 -08:00
Siddharth Agarwal
f82ca9d07a
test-mergedriver.t: update output
2015-12-02 13:20:30 -08:00
Siddharth Agarwal
05ebe5655d
test-mergedriver.t: update output
...
This is temporarily broken -- it will be fixed with upcoming mergedriver
changes.
2015-11-17 16:53:47 -08:00
Siddharth Agarwal
e49d9a23dc
initial mergedriver implementation
2015-10-15 00:37:45 -07:00
