mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 00:14:35 +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
68 lines
1.4 KiB
Perl
68 lines
1.4 KiB
Perl
#chg-compatible
|
|
|
|
$ disable treemanifest
|
|
Corrupt an hg repo with two pulls.
|
|
create one repo with a long history
|
|
|
|
$ hg init source1
|
|
$ cd source1
|
|
$ touch foo
|
|
$ hg add foo
|
|
$ for i in 1 2 3 4 5 6 7 8 9 10; do
|
|
> echo $i >> foo
|
|
> hg ci -m $i
|
|
> done
|
|
$ cd ..
|
|
|
|
create one repo with a shorter history
|
|
|
|
$ hg clone -r 0 source1 source2
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ cd source2
|
|
$ echo a >> foo
|
|
$ hg ci -m a
|
|
$ cd ..
|
|
|
|
create a third repo to pull both other repos into it
|
|
|
|
$ hg init corrupted
|
|
$ cd corrupted
|
|
|
|
use a hook to make the second pull start while the first one is still running
|
|
|
|
$ echo '[hooks]' >> .hg/hgrc
|
|
$ echo 'prechangegroup = sleep 5' >> .hg/hgrc
|
|
|
|
start a pull...
|
|
|
|
$ hg pull ../source1 > pull.out 2>&1 &
|
|
|
|
... and start another pull before the first one has finished
|
|
|
|
$ sleep 1
|
|
$ hg pull ../source2 2>/dev/null
|
|
$ cat pull.out
|
|
pulling from ../source1
|
|
requesting all changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 10 changesets with 10 changes to 1 files
|
|
|
|
see the result
|
|
|
|
$ wait
|
|
$ hg verify
|
|
checking changesets
|
|
checking manifests
|
|
crosschecking files in changesets and manifests
|
|
checking files
|
|
1 files, 11 changesets, 11 total revisions
|
|
|
|
$ cd ..
|