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
101 lines
2.9 KiB
Perl
101 lines
2.9 KiB
Perl
#chg-compatible
|
|
|
|
|
|
$ configure mutation-norecord
|
|
$ enable amend rebase
|
|
$ mkcommit() {
|
|
> echo "$1" > "$1"
|
|
> hg add "$1"
|
|
> hg ci -m "add $1"
|
|
> }
|
|
|
|
Test situation with divergence. Restack should rebase unstable children
|
|
onto the newest successor of their parent.
|
|
$ newrepo
|
|
$ mkcommit a
|
|
$ mkcommit b
|
|
$ mkcommit c
|
|
$ hg prev
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
[*] add b (glob)
|
|
$ hg amend -m "successor 1" --no-rebase
|
|
hint[amend-restack]: descendants of 7c3bad9141dc are left behind - use 'hg restack' to rebase them
|
|
hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
|
|
$ hg up 7c3bad9141dcb46ff89abf5f61856facd56e476c
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ hg amend -m "successor 2" --no-rebase
|
|
hint[amend-restack]: descendants of 7c3bad9141dc are left behind - use 'hg restack' to rebase them
|
|
hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
|
|
$ hg up 7c3bad9141dcb46ff89abf5f61856facd56e476c
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ showgraph
|
|
o cef323f40828 successor 2
|
|
│
|
|
│ o f60c1f15a70e successor 1
|
|
├─╯
|
|
│ o 4538525df7e2 add c
|
|
│ │
|
|
│ @ 7c3bad9141dc add b
|
|
├─╯
|
|
o 1f0dee641bb7 add a
|
|
$ hg rebase --restack
|
|
rebasing 4538525df7e2 "add c"
|
|
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ showgraph
|
|
o b0a0bc953ac3 add c
|
|
│
|
|
@ cef323f40828 successor 2
|
|
│
|
|
│ o f60c1f15a70e successor 1
|
|
├─╯
|
|
o 1f0dee641bb7 add a
|
|
|
|
Test situation with divergence due to an unamend. This should actually succeed
|
|
since the successor is obsolete.
|
|
$ newrepo
|
|
$ mkcommit a
|
|
$ mkcommit b
|
|
$ mkcommit c
|
|
$ hg prev
|
|
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
|
|
[*] add b (glob)
|
|
$ echo b >> b
|
|
$ hg amend
|
|
hint[amend-restack]: descendants of 7c3bad9141dc are left behind - use 'hg restack' to rebase them
|
|
hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
|
|
$ showgraph
|
|
@ c54ee8acf83d add b
|
|
│
|
|
│ o 4538525df7e2 add c
|
|
│ │
|
|
│ x 7c3bad9141dc add b
|
|
├─╯
|
|
o 1f0dee641bb7 add a
|
|
$ hg up 7c3bad9141dcb46ff89abf5f61856facd56e476c
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo c >> b
|
|
$ hg amend
|
|
hint[amend-restack]: descendants of 7c3bad9141dc are left behind - use 'hg restack' to rebase them
|
|
hint[hint-ack]: use 'hg hint --ack amend-restack' to silence these hints
|
|
$ showgraph
|
|
@ 2c965323ca2a add b
|
|
│
|
|
│ o c54ee8acf83d add b
|
|
├─╯
|
|
│ o 4538525df7e2 add c
|
|
│ │
|
|
│ x 7c3bad9141dc add b
|
|
├─╯
|
|
o 1f0dee641bb7 add a
|
|
$ hg unamend
|
|
$ hg up -C c54ee8acf83d47ec674bca5bb6ba7be56227bd89
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ showgraph
|
|
@ c54ee8acf83d add b
|
|
│
|
|
│ o 4538525df7e2 add c
|
|
│ │
|
|
│ x 7c3bad9141dc add b
|
|
├─╯
|
|
o 1f0dee641bb7 add a
|