mirror of
https://github.com/facebook/sapling.git
synced 2024-10-06 14:58:03 +03:00
8790d20014
Summary: `run-tests.py` might set up watchman. Respect its settings. Reviewed By: DurhamG Differential Revision: D38641847 fbshipit-source-id: 87f2ab21d014c56135f7c7fec33dd6d9e458330d
156 lines
3.0 KiB
Perl
156 lines
3.0 KiB
Perl
#debugruntest-compatible
|
|
# coding=utf-8
|
|
|
|
# Copyright (c) Meta Platforms, Inc. and affiliates.
|
|
# Copyright (c) Mercurial Contributors.
|
|
#
|
|
# This software may be used and distributed according to the terms of the
|
|
# GNU General Public License version 2 or any later version.
|
|
|
|
#if fsmonitor
|
|
$ setconfig workingcopy.ruststatus=False
|
|
#endif
|
|
|
|
$ setconfig experimental.allowfilepeer=True
|
|
$ setconfig 'extensions.treemanifest=!'
|
|
|
|
$ cat >> $HGRCPATH << 'EOF'
|
|
> [extensions]
|
|
> rebase=
|
|
> [phases]
|
|
> publish=False
|
|
> EOF
|
|
|
|
$ hg init a
|
|
$ cd a
|
|
|
|
$ echo A > A
|
|
$ hg add A
|
|
$ hg ci -m A
|
|
|
|
$ echo B > B
|
|
$ hg add B
|
|
$ hg ci -m B
|
|
|
|
$ echo C >> A
|
|
$ hg ci -m C
|
|
|
|
$ hg up -q -C 'min(_all())'
|
|
|
|
$ echo D >> A
|
|
$ hg ci -m D
|
|
|
|
$ echo E > E
|
|
$ hg add E
|
|
$ hg ci -m E
|
|
|
|
$ hg up -q -C 'min(_all())'
|
|
|
|
$ echo F >> A
|
|
$ hg ci -m F
|
|
|
|
$ cd ..
|
|
|
|
# Rebasing B onto E - check keep: and phases
|
|
|
|
$ hg clone -q -u . a a1
|
|
$ cd a1
|
|
|
|
$ tglogp
|
|
@ 3225f3ea730a draft 'F'
|
|
│
|
|
│ o ae36e8e3dfd7 draft 'E'
|
|
│ │
|
|
│ o 46b37eabc604 draft 'D'
|
|
├─╯
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
$ hg rebase -s 'desc(B)' -d 'desc(E)' --keep
|
|
rebasing 27547f69f254 "B"
|
|
rebasing 965c486023db "C"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
# Solve the conflict and go on:
|
|
|
|
$ echo 'conflict solved' > A
|
|
$ rm A.orig
|
|
$ hg resolve -m A
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
$ hg rebase --continue
|
|
already rebased 27547f69f254 "B" as 45396c49d53b
|
|
rebasing 965c486023db "C"
|
|
|
|
$ tglogp
|
|
o d2d25e26288e draft 'C'
|
|
│
|
|
o 45396c49d53b draft 'B'
|
|
│
|
|
│ @ 3225f3ea730a draft 'F'
|
|
│ │
|
|
o │ ae36e8e3dfd7 draft 'E'
|
|
│ │
|
|
o │ 46b37eabc604 draft 'D'
|
|
├─╯
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
$ cd ..
|
|
|
|
# Rebase F onto E:
|
|
|
|
$ hg clone -q -u . a a2
|
|
$ cd a2
|
|
|
|
$ tglogp
|
|
@ 3225f3ea730a draft 'F'
|
|
│
|
|
│ o ae36e8e3dfd7 draft 'E'
|
|
│ │
|
|
│ o 46b37eabc604 draft 'D'
|
|
├─╯
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
$ hg rebase -s 'desc(F)' -d 'desc(E)'
|
|
rebasing 3225f3ea730a "F"
|
|
merging A
|
|
warning: 1 conflicts while merging A! (edit, then use 'hg resolve --mark')
|
|
unresolved conflicts (see hg resolve, then hg rebase --continue)
|
|
[1]
|
|
|
|
# Solve the conflict and go on:
|
|
|
|
$ echo 'conflict solved' > A
|
|
$ rm A.orig
|
|
$ hg resolve -m A
|
|
(no more unresolved files)
|
|
continue: hg rebase --continue
|
|
$ hg rebase --continue
|
|
rebasing 3225f3ea730a "F"
|
|
|
|
$ tglogp
|
|
@ 530bc6058bd0 draft 'F'
|
|
│
|
|
o ae36e8e3dfd7 draft 'E'
|
|
│
|
|
o 46b37eabc604 draft 'D'
|
|
│
|
|
│ o 965c486023db draft 'C'
|
|
│ │
|
|
│ o 27547f69f254 draft 'B'
|
|
├─╯
|
|
o 4a2df7238c3b draft 'A'
|
|
|
|
$ cd ..
|