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
71 lines
1.7 KiB
Perl
71 lines
1.7 KiB
Perl
#chg-compatible
|
|
|
|
$ cat <<EOF > merge
|
|
> import sys, os
|
|
> print("merging for", os.path.basename(sys.argv[1]))
|
|
> EOF
|
|
$ HGMERGE="$PYTHON ../merge"; export HGMERGE
|
|
|
|
$ hg init A1
|
|
$ cd A1
|
|
$ echo This is file foo1 > foo
|
|
$ echo This is file bar1 > bar
|
|
$ hg add foo bar
|
|
$ hg commit -m "commit text"
|
|
|
|
$ cd ..
|
|
$ hg clone A1 B1
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd A1
|
|
$ rm bar
|
|
$ hg remove bar
|
|
$ hg commit -m "commit test"
|
|
|
|
$ cd ../B1
|
|
$ echo This is file foo22 > foo
|
|
$ hg commit -m "commit test"
|
|
|
|
$ cd ..
|
|
$ hg clone A1 A2
|
|
updating to branch default
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg clone B1 B2
|
|
updating to branch default
|
|
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
|
|
$ cd A1
|
|
$ hg pull ../B1
|
|
pulling from ../B1
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 1 changes to 1 files
|
|
$ hg merge
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg commit -m "commit test"
|
|
bar should remain deleted.
|
|
$ hg manifest --debug
|
|
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
|
|
|
$ cd ../B2
|
|
$ hg pull ../A2
|
|
pulling from ../A2
|
|
searching for changes
|
|
adding changesets
|
|
adding manifests
|
|
adding file changes
|
|
added 1 changesets with 0 changes to 0 files
|
|
$ hg merge
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
(branch merge, don't forget to commit)
|
|
$ hg commit -m "commit test"
|
|
bar should remain deleted.
|
|
$ hg manifest --debug
|
|
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
|
|
|
|
$ cd ..
|