mirror of
https://github.com/facebook/sapling.git
synced 2024-10-10 16:57:49 +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
102 lines
2.1 KiB
Perl
102 lines
2.1 KiB
Perl
#chg-compatible
|
|
|
|
Test new conflict switching:
|
|
|
|
$ configure mutation-norecord
|
|
$ newrepo
|
|
$ enable amend morestatus rebase
|
|
$ setconfig morestatus.show=True
|
|
$ setconfig rebase.singletransaction=True
|
|
$ setconfig rebase.experimental.inmemory=True
|
|
$ setconfig rebase.experimental.inmemorywarning="rebasing in-memory!"
|
|
|
|
$ hg debugdrawdag <<'EOS'
|
|
> f
|
|
> |
|
|
> e
|
|
> |
|
|
> c d
|
|
> |/
|
|
> b g
|
|
> |/
|
|
> a
|
|
> EOS
|
|
|
|
Make conflicts halfway up the stack:
|
|
$ hg up -C f
|
|
5 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
(activating bookmark f)
|
|
$ echo "conflict" > c
|
|
$ hg add c
|
|
$ hg amend -q
|
|
$ hg rebase -q -s g -d .
|
|
rebasing in-memory!
|
|
$ hg log -G -r 'desc(a)':: -T '{desc}'
|
|
o g
|
|
│
|
|
@ f
|
|
│
|
|
o e
|
|
│
|
|
o d
|
|
│
|
|
│ o c
|
|
├─╯
|
|
o b
|
|
│
|
|
o a
|
|
|
|
$ cp -R . ../control
|
|
$ hg rebase -d c
|
|
rebasing in-memory!
|
|
rebasing f4016ed9f5d0 "d" (d)
|
|
rebasing 881eb15e0fdf "e" (e)
|
|
rebasing e692c3b32196 "f" (f)
|
|
merging c
|
|
hit merge conflicts (in c); switching to on-disk merge
|
|
rebasing e692c3b32196 "f" (f)
|
|
merging c
|
|
warning: 1 conflicts while merging c! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
$ hg resolve --all --tool :other
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
$ hg rebase --continue
|
|
already rebased f4016ed9f5d0 "d" (d) as 32bb4413a7df
|
|
already rebased 881eb15e0fdf "e" (e) as d82c41319fdd
|
|
rebasing e692c3b32196 "f" (f)
|
|
rebasing 2a19607ff85c "g" (g)
|
|
$ hg log -G -r 'desc(a)':: -T '{desc} {node|short}'
|
|
o g 24c12a3229e2
|
|
│
|
|
@ f c33e7f678afd
|
|
│
|
|
o e d82c41319fdd
|
|
│
|
|
o d 32bb4413a7df
|
|
│
|
|
o c a82ac2b38757
|
|
│
|
|
o b 488e1b7e7341
|
|
│
|
|
o a b173517d0057
|
|
|
|
|
|
Try it with uncommitted changes, ensure it aborts nicely:
|
|
|
|
$ hg up -Cq a
|
|
$ hg clean
|
|
$ echo "test" > a
|
|
$ hg rebase -s d82c41319fdd -d a
|
|
rebasing in-memory!
|
|
rebasing d82c41319fdd "e" (e)
|
|
rebasing c33e7f678afd "f" (f)
|
|
abort: must use on-disk merge for this rebase (hit merge conflicts in c), but you have working copy changes
|
|
(commit, revert, or shelve them)
|
|
[255]
|
|
$ hg st
|
|
M a
|
|
$ cat a
|
|
test
|