mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 23:07:18 +03:00
ba00990cdc
Summary: Created this diff by running: ``` find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#update --clean#goto --clean#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#update --clean#goto --clean#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#update --continue#goto --continue#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#update --continue#goto --continue#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#prog@ update#prog@ goto#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# hg update # hg goto #g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#hg update -C#hg goto -C#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# hg update$# hg goto#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's# update HASH# goto HASH#g' find eden/scm/tests -name \*.t | xargs sed -i -e 's#hg update 1#hg goto 1#g' find eden/scm/tests -name \*.t | xargs sed -i -e "s#'hg update'#'hg goto'#g" find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#:prog:`update`#:prog:`goto`#g' find eden/scm/edenscm -name \*.py | xargs sed -i -e 's#:prog:`update .::`#:prog:`goto .::`#g' sed -i -e 's#commit or update#commit or goto#' eden/integration/hg/update_test.py arc f ``` Though then I had to manually update `eden/integration/hg/update_test.py` to use `assertRegex()` instead of `assertEqual()`, but as noted, that is a temporary issue due to how we run that test for EdenFS for Windows internally. Fixes https://github.com/facebook/sapling/issues/149 Fixes https://github.com/facebook/sapling/issues/293 Reviewed By: zzl0, yancouto Differential Revision: D41859668 fbshipit-source-id: 3bdf4e342fc1a751335960a3216651a5ce35225f
60 lines
1.6 KiB
Perl
60 lines
1.6 KiB
Perl
#chg-compatible
|
|
#debugruntest-compatible
|
|
|
|
Test that checks that relative paths are used in merge
|
|
|
|
$ unset HGMERGE # make sure HGMERGE doesn't interfere with the test
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ mkdir dir && echo a > dir/file
|
|
$ hg ci -Aqm first
|
|
|
|
$ hg up -q null
|
|
$ mkdir dir && echo b > dir/file
|
|
$ hg ci -Aqm second
|
|
|
|
$ hg up -q 'desc(first)'
|
|
|
|
$ hg merge 'desc(second)'
|
|
merging dir/file
|
|
warning: 1 conflicts while merging dir/file! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg goto -C .' to abandon
|
|
[1]
|
|
|
|
$ hg up -q -C .
|
|
$ cd dir
|
|
$ hg merge 'desc(second)'
|
|
merging file
|
|
warning: 1 conflicts while merging file! (edit, then use 'hg resolve --mark')
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg goto -C .' to abandon
|
|
[1]
|
|
|
|
Merging with different paths
|
|
$ cd ..
|
|
$ rm -rf repo
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ mkdir dir && echo a > dir/file
|
|
$ hg ci -Aqm common
|
|
$ echo b > dir/file
|
|
$ hg commit -Am modify
|
|
|
|
$ hg up -q 'desc(common)'
|
|
$ mkdir dir2
|
|
$ hg mv dir/file dir2/file
|
|
$ hg ci -Aqm move
|
|
$ hg merge 'desc(modify)'
|
|
merging dir2/file and dir/file to dir2/file
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg up -q -C .
|
|
$ cd dir2
|
|
$ hg merge 'desc(modify)'
|
|
merging file and ../dir/file to file
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|