mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 08:47:12 +03:00
98d9269874
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
97 lines
2.4 KiB
Perl
97 lines
2.4 KiB
Perl
#chg-compatible
|
|
|
|
Test update logic when there are renames or weird same-name cases between dirs
|
|
and files
|
|
|
|
$ setconfig experimental.nativecheckout=true
|
|
|
|
Setup server
|
|
$ newserver server
|
|
|
|
Update with local changes across a file rename
|
|
|
|
$ newremoterepo r1
|
|
|
|
$ echo a > a
|
|
$ hg add a
|
|
$ hg ci -m a
|
|
|
|
$ hg mv a b
|
|
$ hg ci -m rename
|
|
|
|
$ echo b > b
|
|
$ hg ci -m change
|
|
|
|
$ hg up -q cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b
|
|
|
|
$ echo c > a
|
|
|
|
$ hg up
|
|
merging a and b to b
|
|
warning: 1 conflicts while merging b! (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
|
|
[1]
|
|
|
|
Test update when local untracked directory exists with the same name as a
|
|
tracked file in a commit we are updating to
|
|
$ newremoterepo r2
|
|
$ echo root > root && hg ci -Am root # rev 0
|
|
adding root
|
|
$ echo text > name && hg ci -Am "name is a file" # rev 1
|
|
adding name
|
|
$ hg up 'desc(root)'
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mkdir name
|
|
$ hg up 'desc(name)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
Test update when local untracked directory exists with some files in it and has
|
|
the same name a tracked file in a commit we are updating to. In future this
|
|
should be updated to give an friendlier error message, but now we should just
|
|
make sure that this does not erase untracked data
|
|
$ hg up 'desc(root)'
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
$ mkdir name
|
|
$ echo text > name/file
|
|
$ hg st
|
|
? name/file
|
|
$ hg up 'desc(name)'
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd ..
|
|
|
|
#if symlink
|
|
|
|
Test update when two commits have symlinks that point to different folders
|
|
$ newremoterepo r3
|
|
$ echo root > root && hg ci -Am root
|
|
adding root
|
|
$ mkdir folder1 && mkdir folder2
|
|
$ ln -s folder1 folder
|
|
$ hg ci -Am "symlink to folder1"
|
|
adding folder
|
|
$ rm folder
|
|
$ ln -s folder2 folder
|
|
$ hg ci -Am "symlink to folder2"
|
|
$ hg up baf33104e0bc1162a796504d4eecd1159f3a6e93
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd ..
|
|
|
|
#endif
|
|
|
|
#if rmcwd
|
|
|
|
Test that warning is printed if cwd is deleted during update
|
|
$ newremoterepo r4
|
|
$ mkdir dir
|
|
$ cd dir
|
|
$ echo a > a
|
|
$ echo b > b
|
|
$ hg add a b
|
|
$ hg ci -m "file and dir"
|
|
$ hg up -q null
|
|
current directory was removed
|
|
(consider changing to repo root: $TESTTMP/r4)
|
|
|
|
#endif
|