mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 00:45:18 +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
85 lines
1.7 KiB
Perl
85 lines
1.7 KiB
Perl
#chg-compatible
|
|
|
|
|
|
$ cat > writepatterns.py <<EOF
|
|
> import sys
|
|
>
|
|
> path = sys.argv[1]
|
|
> patterns = sys.argv[2:]
|
|
>
|
|
> fp = open(path, 'wb')
|
|
> for pattern in patterns:
|
|
> count = int(pattern[0:-1])
|
|
> char = (pattern[-1] + '\n').encode('utf-8')
|
|
> fp.write(char*count)
|
|
> fp.close()
|
|
> EOF
|
|
|
|
prepare repo
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
|
|
These initial lines of Xs were not in the original file used to generate
|
|
the patch. So all the patch hunks need to be applied to a constant offset
|
|
within this file. If the offset isn't tracked then the hunks can be
|
|
applied to the wrong lines of this file.
|
|
|
|
$ $PYTHON ../writepatterns.py a 34X 10A 1B 10A 1C 10A 1B 10A 1D 10A 1B 10A 1E 10A 1B 10A
|
|
$ hg commit -Am adda
|
|
adding a
|
|
|
|
This is a cleaner patch generated via diff
|
|
In this case it reproduces the problem when
|
|
the output of hg export does not
|
|
import patch
|
|
|
|
$ hg import -v -m 'b' -d '2 0' - <<EOF
|
|
> --- a/a 2009-12-08 19:26:17.000000000 -0800
|
|
> +++ b/a 2009-12-08 19:26:17.000000000 -0800
|
|
> @@ -9,7 +9,7 @@
|
|
> A
|
|
> A
|
|
> B
|
|
> -A
|
|
> +a
|
|
> A
|
|
> A
|
|
> A
|
|
> @@ -53,7 +53,7 @@
|
|
> A
|
|
> A
|
|
> B
|
|
> -A
|
|
> +a
|
|
> A
|
|
> A
|
|
> A
|
|
> @@ -75,7 +75,7 @@
|
|
> A
|
|
> A
|
|
> B
|
|
> -A
|
|
> +a
|
|
> A
|
|
> A
|
|
> A
|
|
> EOF
|
|
applying patch from stdin
|
|
patching file a
|
|
Hunk #1 succeeded at 43 (offset 34 lines).
|
|
Hunk #2 succeeded at 87 (offset 34 lines).
|
|
Hunk #3 succeeded at 109 (offset 34 lines).
|
|
committing files:
|
|
a
|
|
committing manifest
|
|
committing changelog
|
|
created 189885cecb41
|
|
|
|
compare imported changes against reference file
|
|
|
|
$ $PYTHON ../writepatterns.py aref 34X 10A 1B 1a 9A 1C 10A 1B 10A 1D 10A 1B 1a 9A 1E 10A 1B 1a 9A
|
|
$ diff aref a
|
|
|
|
$ cd ..
|