sapling/eden/hg-server/tests/test-update-reverse.t
Durham Goode 98d9269874 server: copy hg to a new hg-server directory
Summary:
Create a fork of the Mercurial code that we can use to build server
rpms. The hg servers will continue to exist for a few more months while we move
the darkstorm and ediscovery use cases off them. In the mean time, we want to
start making breaking changes to the client, so let's create a stable copy of
the hg code to produce rpms for the hg servers.

The fork is based off c7770c78d, the latest hg release.

This copies the files as is, then adds some minor tweaks to get it to build:
- Disables some lint checks that appear to be bypassed by path
- sed replace eden/scm with eden/hg-server
- Removed a dependency on scm/telemetry from the edenfs-client tests since
  scm/telemetry pulls in the original eden/scm/lib/configparser which conflicts
  with the hg-server conflict parser.

allow-large-files

Reviewed By: quark-zju

Differential Revision: D27632557

fbshipit-source-id: b2f442f4ec000ea08e4d62de068750832198e1f4
2021-04-09 10:09:06 -07:00

82 lines
1.6 KiB
Perl

#chg-compatible
$ setconfig experimental.nativecheckout=true
$ newserver server
$ newremoterepo repo
$ touch a
$ hg add a
$ hg commit -m "Added a"
$ touch main
$ hg add main
$ hg commit -m "Added main"
$ hg checkout c2eda428b523117ba9bbdfbbef034bb4bc8fead9
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
'main' should be gone:
$ ls
a
$ touch side1
$ hg add side1
$ hg commit -m "Added side1"
$ touch side2
$ hg add side2
$ hg commit -m "Added side2"
$ hg log
commit: 91ebc10ed028
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Added side2
commit: b932d7dbb1e1
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Added side1
commit: 71a760306caf
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Added main
commit: c2eda428b523
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Added a
$ hg heads
commit: 91ebc10ed028
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Added side2
commit: 71a760306caf
user: test
date: Thu Jan 01 00:00:00 1970 +0000
summary: Added main
$ ls
a
side1
side2
$ hg update --debug -C 71a760306cafb582ff672db4d4beb9625f34022d
Using native checkout
Native checkout plan:
rm side1
rm side2
up main=>b80de5d138758541c5f05265ad144ab9fa86d1db
Applying to $TESTTMP/repo
Apply done
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ ls
a
main