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
92 lines
1.7 KiB
Perl
92 lines
1.7 KiB
Perl
#chg-compatible
|
|
#debugruntest-compatible
|
|
#inprocess-hg-incompatible
|
|
$ setconfig experimental.allowfilepeer=True
|
|
|
|
Issue586: removing remote files after merge appears to corrupt the
|
|
dirstate
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
$ echo a > a
|
|
$ hg ci -Ama
|
|
adding a
|
|
|
|
$ hg init ../b
|
|
$ cd ../b
|
|
$ echo b > b
|
|
$ hg ci -Amb
|
|
adding b
|
|
|
|
$ hg pull -f ../a
|
|
pulling from ../a
|
|
searching for changes
|
|
warning: repository is unrelated
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg rm -f a
|
|
$ hg ci -Amc
|
|
|
|
$ hg st -A
|
|
C b
|
|
$ cd ..
|
|
|
|
Issue1433: Traceback after two unrelated pull, two move, a merge and
|
|
a commit (related to issue586)
|
|
|
|
create test repos
|
|
|
|
$ hg init repoa
|
|
$ touch repoa/a
|
|
$ hg -R repoa ci -Am adda
|
|
adding a
|
|
|
|
$ hg init repob
|
|
$ touch repob/b
|
|
$ hg -R repob ci -Am addb
|
|
adding b
|
|
|
|
$ hg init repoc
|
|
$ cd repoc
|
|
$ hg pull ../repoa
|
|
pulling from ../repoa
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
$ hg goto
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ mkdir tst
|
|
$ hg mv * tst
|
|
$ hg ci -m "import a in tst"
|
|
$ hg pull -f ../repob
|
|
pulling from ../repob
|
|
searching for changes
|
|
warning: repository is unrelated
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
|
|
merge both repos
|
|
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ mkdir src
|
|
|
|
move b content
|
|
|
|
$ hg mv b src
|
|
$ hg ci -m "import b in src"
|
|
$ hg manifest
|
|
src/b
|
|
tst/a
|
|
|
|
$ cd ..
|