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
90 lines
1.5 KiB
Perl
90 lines
1.5 KiB
Perl
#debugruntest-compatible
|
|
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
# Copyright (c) Mercurial Contributors.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
$ setconfig devel.segmented-changelog-rev-compat=true
|
|
$ hg init repo
|
|
$ cd repo
|
|
$ echo foo > a
|
|
$ hg add a
|
|
$ hg commit -m 1
|
|
|
|
$ echo bar > b
|
|
$ hg add b
|
|
$ hg remove a
|
|
|
|
# Should show a removed and b added:
|
|
|
|
$ hg status
|
|
A b
|
|
R a
|
|
|
|
$ hg revert --all
|
|
undeleting a
|
|
forgetting b
|
|
|
|
# Should show b unknown and a back to normal:
|
|
|
|
$ hg status
|
|
? b
|
|
|
|
$ rm b
|
|
|
|
$ hg co -C 0
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo foo-a > a
|
|
$ hg commit -m 2a
|
|
|
|
$ hg co -C 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo foo-b > a
|
|
$ hg commit -m 2b
|
|
|
|
$ HGMERGE=true hg merge 1
|
|
merging a
|
|
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
|
|
# Should show foo-b:
|
|
|
|
$ cat a
|
|
foo-b
|
|
|
|
$ echo bar > b
|
|
$ hg add b
|
|
$ rm a
|
|
$ hg remove a
|
|
|
|
# Should show a removed and b added:
|
|
|
|
$ hg status
|
|
A b
|
|
R a
|
|
|
|
# Revert should fail:
|
|
|
|
$ hg revert
|
|
abort: uncommitted merge with no revision specified
|
|
(use 'hg goto' or see 'hg help revert')
|
|
[255]
|
|
|
|
# Revert should be ok now:
|
|
|
|
$ hg revert -r2 --all
|
|
undeleting a
|
|
forgetting b
|
|
|
|
# Should show b unknown and a marked modified (merged):
|
|
|
|
$ hg status
|
|
M a
|
|
? b
|
|
|
|
# Should show foo-b:
|
|
|
|
$ cat a
|
|
foo-b
|