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
65 lines
1.2 KiB
Perl
65 lines
1.2 KiB
Perl
#chg-compatible
|
|
|
|
$ configure mutation-norecord
|
|
$ enable amend rebase
|
|
$ setconfig rebase.experimental.inmemory=True
|
|
$ setconfig rebase.singletransaction=True
|
|
$ setconfig amend.autorestack=no-conflict
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "add $1"
|
|
> }
|
|
|
|
Test invalid value for amend.autorestack
|
|
$ newrepo
|
|
$ hg debugdrawdag<<'EOS'
|
|
> D
|
|
> |
|
|
> C C_old
|
|
> | | # amend: B_old -> B
|
|
> B B_old # amend: C_old -> C
|
|
> | /
|
|
> |/
|
|
> A
|
|
> EOS
|
|
$ hg update -qC B
|
|
$ echo "new content" > B
|
|
$ showgraph
|
|
o 3c36beb5705f D
|
|
│
|
|
│ o 26805aba1e60 C
|
|
│ │
|
|
x │ 07863d11c289 C_old
|
|
│ │
|
|
│ @ 112478962961 B
|
|
│ │
|
|
x │ 3326d5194fc9 B_old
|
|
├─╯
|
|
o 426bada5c675 A
|
|
$ hg amend -m "B'"
|
|
restacking children automatically (unless they conflict)
|
|
rebasing 26805aba1e60 "C" (C)
|
|
$ showgraph
|
|
o 5676eb48a524 C
|
|
│
|
|
@ 180681c3ccd0 B'
|
|
│
|
|
│ o 3c36beb5705f D
|
|
│ │
|
|
│ x 07863d11c289 C_old
|
|
│ │
|
|
│ x 3326d5194fc9 B_old
|
|
├─╯
|
|
o 426bada5c675 A
|
|
$ hg rebase --restack
|
|
rebasing 3c36beb5705f "D" (D)
|
|
$ showgraph
|
|
o d1e904d06977 D
|
|
│
|
|
o 5676eb48a524 C
|
|
│
|
|
@ 180681c3ccd0 B'
|
|
│
|
|
o 426bada5c675 A
|