mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
effa0da8de
Summary: The helper could be used in individual tests to enable chg if chg exists. This allows us to have more precise control on what tests to use chg instead of using a global flag in run-tests.py. This makes certain tests containing many hg commands much faster. For example, `test-revset.t` took 99 seconds before: % ./run-tests.py test-revset.t --time . # Ran 1 tests, 0 skipped, 0 failed. # Producing time report start end cuser csys real Test 0.000 99.990 86.410 12.000 99.990 test-revset.t And 10 seconds after: % ./run-tests.py test-revset.t --time . # Ran 1 tests, 0 skipped, 0 failed. # Producing time report start end cuser csys real Test 0.000 10.080 0.380 0.130 10.080 test-revset.t Also enable it for some other tests. Note the whitelist is not complete. We probably want to whitelist more tests in the future. The feature could be opted out by deleting `contrib/chg/chg`. Reviewed By: phillco Differential Revision: D6767036 fbshipit-source-id: 8220cf408aa198d5d8e2ca5127ca60e2070d3444
96 lines
1.7 KiB
Perl
96 lines
1.7 KiB
Perl
$ . helpers-usechg.sh
|
|
|
|
test that we don't interrupt the merge session if
|
|
a file-level merge failed
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo foo > foo
|
|
$ echo a > bar
|
|
$ hg ci -Am 'add foo'
|
|
adding bar
|
|
adding foo
|
|
|
|
$ hg mv foo baz
|
|
$ echo b >> bar
|
|
$ echo quux > quux1
|
|
$ hg ci -Am 'mv foo baz'
|
|
adding quux1
|
|
|
|
$ hg up -qC 0
|
|
$ echo >> foo
|
|
$ echo c >> bar
|
|
$ echo quux > quux2
|
|
$ hg ci -Am 'change foo'
|
|
adding quux2
|
|
|
|
test with the rename on the remote side
|
|
$ HGMERGE=false hg merge
|
|
merging bar
|
|
merging foo and baz to baz
|
|
merging bar failed!
|
|
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
$ hg resolve -l
|
|
U bar
|
|
R baz
|
|
|
|
test with the rename on the local side
|
|
$ hg up -C 1
|
|
3 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ HGMERGE=false hg merge
|
|
merging bar
|
|
merging baz and foo to baz
|
|
merging bar failed!
|
|
1 files updated, 1 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
show unresolved
|
|
$ hg resolve -l
|
|
U bar
|
|
R baz
|
|
|
|
unmark baz
|
|
$ hg resolve -u baz
|
|
|
|
show
|
|
$ hg resolve -l
|
|
U bar
|
|
U baz
|
|
$ hg st
|
|
M bar
|
|
M baz
|
|
M quux2
|
|
? bar.orig
|
|
|
|
re-resolve baz
|
|
$ hg resolve baz
|
|
merging baz and foo to baz
|
|
|
|
after resolve
|
|
$ hg resolve -l
|
|
U bar
|
|
R baz
|
|
|
|
resolve all warning
|
|
$ hg resolve
|
|
abort: no files or directories specified
|
|
(use --all to re-merge all unresolved files)
|
|
[255]
|
|
|
|
resolve all
|
|
$ hg resolve -a
|
|
merging bar
|
|
warning: conflicts while merging bar! (edit, then use 'hg resolve --mark')
|
|
[1]
|
|
|
|
after
|
|
$ hg resolve -l
|
|
U bar
|
|
R baz
|
|
|
|
$ cd ..
|