Mercurial > hg
annotate tests/test-rebase-conflicts.t @ 33771:96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
morestatus extension in fbext use to show more context about the state of the
repo like the repository is in a unfinished merge state, or a rebase is going
on, or histedit is going on, listing the files which need to be resolved and
also suggesting ways to handle the situation.
This patch moves the extension directly to core by plugging it into the
--verbose flag of the status command. So now if you are in any unfinished state
and you do hg status -v, it will show you details and help related to the state.
The extension in fbext also shows context about unfinished update state
which is not ported to core as that plug in hooks to update command which need
to be tackled somewhat differently.
The following configuration will turn the behaviour on by default
[commands]
status.verbose = 1
You can also skip considering some states like bisect as follows:
[commands]
status.skipstates=bisect
This patch also adds test for the feature.
.. feature::
``hg status -v`` can now show unfinished state. For example, when in
an unfinished rebase state, ``hg status -v`` might show::
# The repository is in an unfinished *rebase* state.
# No unresolved merge conflicts.
# To continue: hg rebase --continue
# To abort: hg rebase --abort
Differential Revision: https://phab.mercurial-scm.org/D219
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 03 Aug 2017 05:12:35 +0530 |
parents | 3b7cb3d17137 |
children | 6c1a9fd8361b |
rev | line source |
---|---|
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
26922
34bba01a1355
test: use generaldelta in 'test-rebase-conflict.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26614
diff
changeset
|
2 > [format] |
34bba01a1355
test: use generaldelta in 'test-rebase-conflict.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26614
diff
changeset
|
3 > usegeneraldelta=yes |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
4 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
5 > rebase= |
33034
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
6 > drawdag=$TESTDIR/drawdag.py |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
7 > |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
8 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
9 > publish=False |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
10 > |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
11 > [alias] |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
12 > tglog = log -G --template "{rev}:{phase} '{desc}' {branches} {bookmarks}\n" |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
13 > EOF |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
14 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
15 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
16 $ cd a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
17 $ echo c1 >common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
18 $ hg add common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
19 $ hg ci -m C1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
20 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
21 $ echo c2 >>common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
22 $ hg ci -m C2 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
23 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
24 $ echo c3 >>common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
25 $ hg ci -m C3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
26 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
27 $ hg up -q -C 1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
28 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
29 $ echo l1 >>extra |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
30 $ hg add extra |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
31 $ hg ci -m L1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
32 created new head |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
33 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
34 $ sed -e 's/c2/l2/' common > common.new |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
35 $ mv common.new common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
36 $ hg ci -m L2 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
37 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
38 $ echo l3 >> extra2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
39 $ hg add extra2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
40 $ hg ci -m L3 |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
41 $ hg bookmark mybook |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
42 |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
43 $ hg phase --force --secret 4 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
44 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
45 $ hg tglog |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
46 @ 5:secret 'L3' mybook |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
47 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
48 o 4:secret 'L2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
49 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
50 o 3:draft 'L1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
51 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
52 | o 2:draft 'C3' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
53 |/ |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
54 o 1:draft 'C2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
55 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
56 o 0:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
57 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
58 Try to call --continue: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
59 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
60 $ hg rebase --continue |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
61 abort: no rebase in progress |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
62 [255] |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
63 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
64 Conflicting rebase: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
65 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
66 $ hg rebase -s 3 -d 2 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
67 rebasing 3:3163e20567cc "L1" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
68 rebasing 4:46f0b057b5c0 "L2" |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
69 merging common |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25695
diff
changeset
|
70 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
18933
42b620fc89e2
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
Augie Fackler <raf@durin42.com>
parents:
18755
diff
changeset
|
71 unresolved conflicts (see hg resolve, then hg rebase --continue) |
18935
e5d9441ec281
dispatch: exit with status 1 for an InterventionRequired exception (bc)
Augie Fackler <raf@durin42.com>
parents:
18933
diff
changeset
|
72 [1] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
73 |
33771
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
74 $ hg status --config commands.status.verbose=1 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
75 M common |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
76 ? common.orig |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
77 # The repository is in an unfinished *rebase* state. |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
78 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
79 # Unresolved merge conflicts: |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
80 # |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
81 # common |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
82 # |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
83 # To mark files as resolved: hg resolve --mark FILE |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
84 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
85 # To continue: hg rebase --continue |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
86 # To abort: hg rebase --abort |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
87 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
88 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
89 Try to continue without solving the conflict: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
90 |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
91 $ hg rebase --continue |
29975
c15f06109b7a
localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
29936
diff
changeset
|
92 abort: unresolved merge conflicts (see 'hg help resolve') |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
93 [255] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
94 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
95 Conclude rebase: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
96 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
97 $ echo 'resolved merge' >common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
98 $ hg resolve -m common |
21947
b081decd9062
resolve: add parenthesis around "no more unresolved files" message
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
21391
diff
changeset
|
99 (no more unresolved files) |
27626
157675d0f600
rebase: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents:
26922
diff
changeset
|
100 continue: hg rebase --continue |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
101 $ hg rebase --continue |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
102 already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
103 rebasing 4:46f0b057b5c0 "L2" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
104 rebasing 5:8029388f38dc "L3" (mybook) |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
105 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg (glob) |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
106 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
107 $ hg tglog |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
108 @ 5:secret 'L3' mybook |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
109 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
110 o 4:secret 'L2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
111 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
112 o 3:draft 'L1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
113 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
114 o 2:draft 'C3' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
115 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
116 o 1:draft 'C2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
117 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
118 o 0:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
119 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
120 Check correctness: |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
121 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
122 $ hg cat -r 0 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
123 c1 |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
124 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
125 $ hg cat -r 1 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
126 c1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
127 c2 |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
128 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
129 $ hg cat -r 2 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
130 c1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
131 c2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
132 c3 |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
133 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
134 $ hg cat -r 3 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
135 c1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
136 c2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
137 c3 |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
138 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
139 $ hg cat -r 4 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
140 resolved merge |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
141 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
142 $ hg cat -r 5 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
143 resolved merge |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
144 |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
145 Bookmark stays active after --continue |
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
146 $ hg bookmarks |
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
147 * mybook 5:d67b21408fc0 |
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
148 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15917
diff
changeset
|
149 $ cd .. |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
150 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
151 Check that the right ancestors is used while rebasing a merge (issue4041) |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
152 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
153 $ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
154 requesting all changes |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
155 adding changesets |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
156 adding manifests |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
157 adding file changes |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
158 added 11 changesets with 8 changes to 3 files (+1 heads) |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
159 updating to branch default |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
160 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
161 $ cd issue4041 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
162 $ hg log -G |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
163 o changeset: 10:2f2496ddf49d |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
164 |\ branch: f1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
165 | | tag: tip |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
166 | | parent: 7:4c9fbe56a16f |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
167 | | parent: 9:e31216eec445 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
168 | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
169 | | date: Thu Sep 05 12:59:39 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
170 | | summary: merge |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
171 | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
172 | o changeset: 9:e31216eec445 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
173 | | branch: f1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
174 | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
175 | | date: Thu Sep 05 12:59:10 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
176 | | summary: more changes to f1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
177 | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
178 | o changeset: 8:8e4e2c1a07ae |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
179 | |\ branch: f1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
180 | | | parent: 2:4bc80088dc6b |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
181 | | | parent: 6:400110238667 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
182 | | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
183 | | | date: Thu Sep 05 12:57:59 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
184 | | | summary: bad merge |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
185 | | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
186 o | | changeset: 7:4c9fbe56a16f |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
187 |/ / branch: f1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
188 | | parent: 2:4bc80088dc6b |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
189 | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
190 | | date: Thu Sep 05 12:54:00 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
191 | | summary: changed f1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
192 | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
193 | o changeset: 6:400110238667 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
194 | | branch: f2 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
195 | | parent: 4:12e8ec6bb010 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
196 | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
197 | | date: Tue Sep 03 13:58:02 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
198 | | summary: changed f2 on f2 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
199 | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
200 | | @ changeset: 5:d79e2059b5c0 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
201 | | | parent: 3:8a951942e016 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
202 | | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
203 | | | date: Tue Sep 03 13:57:39 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
204 | | | summary: changed f2 on default |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
205 | | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
206 | o | changeset: 4:12e8ec6bb010 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
207 | |/ branch: f2 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
208 | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
209 | | date: Tue Sep 03 13:57:18 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
210 | | summary: created f2 branch |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
211 | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
212 | o changeset: 3:8a951942e016 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
213 | | parent: 0:24797d4f68de |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
214 | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
215 | | date: Tue Sep 03 13:57:11 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
216 | | summary: added f2.txt |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
217 | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
218 o | changeset: 2:4bc80088dc6b |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
219 | | branch: f1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
220 | | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
221 | | date: Tue Sep 03 13:56:20 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
222 | | summary: added f1.txt |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
223 | | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
224 o | changeset: 1:ef53c9e6b608 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
225 |/ branch: f1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
226 | user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
227 | date: Tue Sep 03 13:55:26 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
228 | summary: created f1 branch |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
229 | |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
230 o changeset: 0:24797d4f68de |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
231 user: szhang |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
232 date: Tue Sep 03 13:55:08 2013 -0400 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
233 summary: added default.txt |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
234 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
235 $ hg rebase -s9 -d2 --debug # use debug to really check merge base used |
29936
3e7ded768556
rebase: make debug logging more consistent
Martin von Zweigbergk <martinvonz@google.com>
parents:
29757
diff
changeset
|
236 rebase onto 4bc80088dc6b starting from e31216eec445 |
31225
749b057b01f3
rebase: allow aborting if last-message.txt is missing
Durham Goode <durham@fb.com>
parents:
30460
diff
changeset
|
237 rebase status stored |
23519
8872d1bf30da
rebase: improve debug messages while processing the list of rebases
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
238 ignoring null merge rebase of 3 |
8872d1bf30da
rebase: improve debug messages while processing the list of rebases
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
239 ignoring null merge rebase of 4 |
8872d1bf30da
rebase: improve debug messages while processing the list of rebases
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
240 ignoring null merge rebase of 6 |
8872d1bf30da
rebase: improve debug messages while processing the list of rebases
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
241 ignoring null merge rebase of 8 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
242 rebasing 9:e31216eec445 "more changes to f1" |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
243 future parents are 2 and -1 |
33121
a5abaa81fad6
rebase: backed out changeset cf8ad0e6c0e4 (issue5610)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
31226
diff
changeset
|
244 rebase status stored |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
245 update to 2:4bc80088dc6b |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
246 resolving manifests |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
247 branchmerge: False, force: True, partial: False |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
248 ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
249 f2.txt: other deleted -> r |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
250 removing f2.txt |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21267
diff
changeset
|
251 f1.txt: remote created -> g |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
252 getting f1.txt |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
253 merge against 9:e31216eec445 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
254 detach base 8:8e4e2c1a07ae |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
255 searching for copies back to rev 3 |
30197
0accd5a5ad04
mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29975
diff
changeset
|
256 unmatched files in other (from topological common ancestor): |
0accd5a5ad04
mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29975
diff
changeset
|
257 f2.txt |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
258 resolving manifests |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
259 branchmerge: True, force: True, partial: False |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
260 ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
261 f1.txt: remote is newer -> g |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
262 getting f1.txt |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
263 committing files: |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
264 f1.txt |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
265 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
266 committing changelog |
33139 | 267 updating the branch cache |
23519
8872d1bf30da
rebase: improve debug messages while processing the list of rebases
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
268 rebased as 19c888675e13 |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
269 rebasing 10:2f2496ddf49d "merge" (tip) |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
270 future parents are 11 and 7 |
33121
a5abaa81fad6
rebase: backed out changeset cf8ad0e6c0e4 (issue5610)
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
31226
diff
changeset
|
271 rebase status stored |
32249
27e67cfea27f
rebase: rename "target" to "destination" in messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
31226
diff
changeset
|
272 already in destination |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
273 merge against 10:2f2496ddf49d |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
274 detach base 9:e31216eec445 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
275 searching for copies back to rev 3 |
30197
0accd5a5ad04
mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29975
diff
changeset
|
276 unmatched files in other (from topological common ancestor): |
0accd5a5ad04
mergecopies: invoke _computenonoverlap for both base and tca during merges
Gábor Stefanik <gabor.stefanik@nng.com>
parents:
29975
diff
changeset
|
277 f2.txt |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
278 resolving manifests |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
279 branchmerge: True, force: True, partial: False |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
280 ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
281 f1.txt: remote is newer -> g |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
282 getting f1.txt |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
283 committing files: |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
284 f1.txt |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
285 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
286 committing changelog |
33139 | 287 updating the branch cache |
23519
8872d1bf30da
rebase: improve debug messages while processing the list of rebases
Mads Kiilerich <madski@unity3d.com>
parents:
23517
diff
changeset
|
288 rebased as 2a7f09cac94c |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
289 rebase merging completed |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
290 update back to initial working directory parent |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
291 resolving manifests |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
292 branchmerge: False, force: False, partial: False |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
293 ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
294 f1.txt: other deleted -> r |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
295 removing f1.txt |
21391
cb15835456cb
merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents:
21267
diff
changeset
|
296 f2.txt: remote created -> g |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
297 getting f2.txt |
25677
af5b2f4ed594
changegroup: properly compute common base in changeggroupsubset (issue4736)
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
24378
diff
changeset
|
298 2 changesets found |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
299 list of changesets: |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
300 e31216eec445e44352c5f01588856059466a24c9 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
301 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
302 bundle2-output-bundle: "HG20", (1 params) 2 parts total |
29593
953839de96ab
bundle2: store changeset count when creating file bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28072
diff
changeset
|
303 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
304 bundle2-output-part: "phase-heads" 24 bytes payload |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
305 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg (glob) |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
306 3 changesets found |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
307 list of changesets: |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
308 4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
309 19c888675e133ab5dff84516926a65672eaf04d9 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
310 2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
311 bundle2-output-bundle: "HG20", 2 parts total |
29593
953839de96ab
bundle2: store changeset count when creating file bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28072
diff
changeset
|
312 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
313 bundle2-output-part: "phase-heads" 24 bytes payload |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
314 adding branch |
26922
34bba01a1355
test: use generaldelta in 'test-rebase-conflict.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26614
diff
changeset
|
315 bundle2-input-bundle: with-transaction |
29593
953839de96ab
bundle2: store changeset count when creating file bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28072
diff
changeset
|
316 bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
317 adding changesets |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
318 add changeset 4c9fbe56a16f |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
319 add changeset 19c888675e13 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
320 add changeset 2a7f09cac94c |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
321 adding manifests |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
322 adding file changes |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
323 adding f1.txt revisions |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
324 added 2 changesets with 2 changes to 1 files |
30211
6b0741d6d234
changegroup: skip delta when the underlying revlog do not use them
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
30197
diff
changeset
|
325 bundle2-input-part: total payload size 1686 |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
326 bundle2-input-part: "phase-heads" supported |
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
327 bundle2-input-part: total payload size 24 |
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
328 bundle2-input-bundle: 1 parts total |
32267
c2380b448265
caches: move the 'updating the branch cache' message in 'updatecaches'
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
32249
diff
changeset
|
329 updating the branch cache |
19969
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
330 invalid branchheads cache (served): tip differs |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
331 rebase completed |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
332 |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
333 Test minimization of merge conflicts |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
334 $ hg up -q null |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
335 $ echo a > a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
336 $ hg add a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
337 $ hg commit -q -m 'a' |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
338 $ echo b >> a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
339 $ hg commit -q -m 'ab' |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
340 $ hg bookmark ab |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
341 $ hg up -q '.^' |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
342 $ echo b >> a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
343 $ echo c >> a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
344 $ hg commit -q -m 'abc' |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
345 $ hg rebase -s 7bc217434fc1 -d ab --keep |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
346 rebasing 13:7bc217434fc1 "abc" (tip) |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
347 merging a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
348 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
349 unresolved conflicts (see hg resolve, then hg rebase --continue) |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
350 [1] |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
351 $ hg diff |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
352 diff -r 328e4ab1f7cc a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
353 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
354 +++ b/a * (glob) |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
355 @@ -1,2 +1,6 @@ |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
356 a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
357 b |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30273
diff
changeset
|
358 +<<<<<<< dest: 328e4ab1f7cc ab - test: ab |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
359 +======= |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
360 +c |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
361 +>>>>>>> source: 7bc217434fc1 - test: abc |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
362 $ hg rebase --abort |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
363 rebase aborted |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
364 $ hg up -q -C 7bc217434fc1 |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
365 $ hg rebase -s . -d ab --keep -t internal:merge3 |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
366 rebasing 13:7bc217434fc1 "abc" (tip) |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
367 merging a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
368 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
369 unresolved conflicts (see hg resolve, then hg rebase --continue) |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
370 [1] |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
371 $ hg diff |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
372 diff -r 328e4ab1f7cc a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
373 --- a/a Thu Jan 01 00:00:00 1970 +0000 |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
374 +++ b/a * (glob) |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
375 @@ -1,2 +1,8 @@ |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
376 a |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30273
diff
changeset
|
377 +<<<<<<< dest: 328e4ab1f7cc ab - test: ab |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
378 b |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
379 +||||||| base |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
380 +======= |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
381 +b |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
382 +c |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
383 +>>>>>>> source: 7bc217434fc1 - test: abc |
33034
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
384 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
385 Test rebase with obsstore turned on and off (issue5606) |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
386 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
387 $ cd $TESTTMP |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
388 $ hg init b |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
389 $ cd b |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
390 $ hg debugdrawdag <<'EOS' |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
391 > D |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
392 > | |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
393 > C |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
394 > | |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
395 > B E |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
396 > |/ |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
397 > A |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
398 > EOS |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
399 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
400 $ hg update E -q |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
401 $ echo 3 > B |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
402 $ hg commit --amend -m E -A B -q |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
403 $ hg rebase -r B+D -d . --config experimental.evolution=all |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
404 rebasing 1:112478962961 "B" (B) |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
405 merging B |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
406 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
407 unresolved conflicts (see hg resolve, then hg rebase --continue) |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
408 [1] |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
409 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
410 $ echo 4 > B |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
411 $ hg resolve -m |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
412 (no more unresolved files) |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
413 continue: hg rebase --continue |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
414 $ hg rebase --continue --config experimental.evolution=none |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
415 rebasing 1:112478962961 "B" (B) |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
416 not rebasing ignored 2:26805aba1e60 "C" (C) |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
417 rebasing 3:f585351a92f8 "D" (D) |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
418 warning: orphaned descendants detected, not stripping 112478962961 |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
419 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg (glob) |
33034
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
420 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
421 $ rm .hg/localtags |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
422 $ hg tglog |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
423 o 5:draft 'D' |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
424 | |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
425 o 4:draft 'B' |
33034
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
426 | |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
427 @ 3:draft 'E' |
33034
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
428 | |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
429 | o 2:draft 'C' |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
430 | | |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
431 | o 1:draft 'B' |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
432 |/ |
33034
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
433 o 0:draft 'A' |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
434 |