Mercurial > hg
annotate tests/test-rebase-conflicts.t @ 51460:cebd96dee99a
branchcache: move the filename to a class attribute
This prepare the introduction of more variant of cache.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sun, 25 Feb 2024 20:40:37 +0100 |
parents | f95ab2c53303 |
children | 9f7cf869e9f4 |
rev | line source |
---|---|
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
1 $ cat >> $HGRCPATH <<EOF |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
2 > [extensions] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
3 > 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
|
4 > drawdag=$TESTDIR/drawdag.py |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
5 > |
15742
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
6 > [phases] |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
7 > publish=False |
65df60a3f96b
phases: prevent rebase to rebase immutable changeset.
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
15501
diff
changeset
|
8 > |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
9 > [alias] |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
10 > 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
|
11 > EOF |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
12 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
13 $ hg init a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
14 $ cd a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
15 $ echo c1 >common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
16 $ hg add common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
17 $ hg ci -m C1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
18 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
19 $ echo c2 >>common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
20 $ hg ci -m C2 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
21 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
22 $ echo c3 >>common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
23 $ hg ci -m C3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
24 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
25 $ hg up -q -C 1 |
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 $ echo l1 >>extra |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
28 $ hg add extra |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
29 $ hg ci -m L1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
30 created new head |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
31 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
32 $ sed -e 's/c2/l2/' common > common.new |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
33 $ mv common.new common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
34 $ hg ci -m L2 |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
35 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
36 $ echo l3 >> extra2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
37 $ hg add extra2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
38 $ hg ci -m L3 |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
39 $ hg bookmark mybook |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
40 |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
41 $ hg phase --force --secret 4 |
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
42 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
43 $ hg tglog |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
44 @ 5:secret 'L3' mybook |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
45 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
46 o 4:secret 'L2' |
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 3:draft 'L1' |
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 2:draft 'C3' |
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 1:draft 'C2' |
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 0:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
55 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
56 Try to call --continue: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
57 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
58 $ hg rebase --continue |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
59 abort: no rebase in progress |
45840
527ce85c2e60
errors: introduce StateError and use it from commands and cmdutil
Martin von Zweigbergk <martinvonz@google.com>
parents:
45826
diff
changeset
|
60 [20] |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
61 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
62 Conflicting rebase: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
63 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
64 $ 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
|
65 rebasing 3:3163e20567cc "L1" |
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
66 rebasing 4:46f0b057b5c0 "L2" |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
67 merging common |
26614
ef1eb6df7071
simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents:
25695
diff
changeset
|
68 warning: conflicts while merging common! (edit, then use 'hg resolve --mark') |
45150
dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Daniel Ploch <dploch@google.com>
parents:
44347
diff
changeset
|
69 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
45826
21733e8c924f
errors: add config that lets user get more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
70 [240] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
71 |
33771
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
72 $ 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
|
73 M common |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
74 ? common.orig |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
75 # 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
|
76 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
77 # 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
|
78 # |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
79 # common |
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 # 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
|
82 |
38341
50f5fc232c16
morestatus: remove some extra spaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37842
diff
changeset
|
83 # To continue: hg rebase --continue |
50f5fc232c16
morestatus: remove some extra spaces
Pulkit Goyal <7895pulkit@gmail.com>
parents:
37842
diff
changeset
|
84 # To abort: hg rebase --abort |
42532
12243f15d53e
statecheck: added support for STATES
Taapas Agrawal <taapas2897@gmail.com>
parents:
42168
diff
changeset
|
85 # To stop: hg rebase --stop |
33771
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
86 |
96f43981c1c4
morestatus: move fb extension to core by plugging to `hg status --verbose`
Pulkit Goyal <7895pulkit@gmail.com>
parents:
33332
diff
changeset
|
87 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
88 Try to continue without solving the conflict: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
89 |
17345
4f8054d3171b
check-code: fix check for trailing whitespace on sh command lines
Mads Kiilerich <mads@kiilerich.com>
parents:
16913
diff
changeset
|
90 $ hg rebase --continue |
29975
c15f06109b7a
localrepo: use single quotes in use warning
timeless <timeless@mozdev.org>
parents:
29936
diff
changeset
|
91 abort: unresolved merge conflicts (see 'hg help resolve') |
45916
fa87536d3d70
errors: raise StateError when there are unresolves merge conflicts
Martin von Zweigbergk <martinvonz@google.com>
parents:
45840
diff
changeset
|
92 [20] |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
93 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
94 Conclude rebase: |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
95 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
96 $ echo 'resolved merge' >common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
97 $ 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
|
98 (no more unresolved files) |
27626
157675d0f600
rebase: hook afterresolvedstates
timeless <timeless@mozdev.org>
parents:
26922
diff
changeset
|
99 continue: hg rebase --continue |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
100 $ hg rebase --continue |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
101 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
|
102 rebasing 4:46f0b057b5c0 "L2" |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
103 rebasing 5:8029388f38dc mybook "L3" |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35384
diff
changeset
|
104 saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-rebase.hg |
6906
808f03f61ebe
Add rebase extension
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
diff
changeset
|
105 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
106 $ hg tglog |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
107 @ 5:secret 'L3' mybook |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
108 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
109 o 4:secret 'L2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
110 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
111 o 3:draft 'L1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
112 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
113 o 2:draft 'C3' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
114 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
115 o 1:draft 'C2' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
116 | |
15917
e66084ef8449
rebase: fix phases movement
Alain Leufroy <alain.leufroyATgmailMYDOTcom>
parents:
15742
diff
changeset
|
117 o 0:draft 'C1' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
118 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
119 Check correctness: |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
120 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
121 $ hg cat -r 0 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
122 c1 |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
123 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
124 $ hg cat -r 1 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
125 c1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
126 c2 |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
127 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
128 $ hg cat -r 2 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
129 c1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
130 c2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
131 c3 |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
132 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
133 $ hg cat -r 3 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
134 c1 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
135 c2 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
136 c3 |
7278
45495d784ad6
rebase: avoid redundant merges (issue1301)
Stefano Tortarolo <stefano.tortarolo@gmail.com>
parents:
6910
diff
changeset
|
137 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
138 $ hg cat -r 4 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
139 resolved merge |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
140 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
141 $ hg cat -r 5 common |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
142 resolved merge |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
143 |
18755
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
144 Bookmark stays active after --continue |
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
145 $ hg bookmarks |
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
146 * mybook 5:d67b21408fc0 |
72412afe4c28
rebase: restore active bookmark after rebase --continue
Durham Goode <durham@fb.com>
parents:
17345
diff
changeset
|
147 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
15917
diff
changeset
|
148 $ 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
|
149 |
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 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
|
151 |
37336
5d10f41ddcc4
tests: use `hg unbundle` instead of `hg pull` in some tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
152 $ hg init issue4041 |
5d10f41ddcc4
tests: use `hg unbundle` instead of `hg pull` in some tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
153 $ cd issue4041 |
5d10f41ddcc4
tests: use `hg unbundle` instead of `hg pull` in some tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
154 $ hg unbundle "$TESTDIR/bundles/issue4041.hg" |
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
|
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) |
39480
89630d0b3e23
phase: report number of non-public changeset alongside the new range
Boris Feld <boris.feld@octobus.net>
parents:
38341
diff
changeset
|
159 new changesets 24797d4f68de:2f2496ddf49d (11 drafts) |
37336
5d10f41ddcc4
tests: use `hg unbundle` instead of `hg pull` in some tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
160 (run 'hg heads' to see heads) |
5d10f41ddcc4
tests: use `hg unbundle` instead of `hg pull` in some tests
Gregory Szorc <gregory.szorc@gmail.com>
parents:
37330
diff
changeset
|
161 $ hg up default |
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
|
162 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
|
163 $ 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
|
164 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
|
165 |\ 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
|
166 | | 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
|
167 | | 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
|
168 | | 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
|
169 | | 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
|
170 | | 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
|
171 | | 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
|
172 | | |
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 | 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
|
174 | | 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
|
175 | | 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
|
176 | | 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
|
177 | | 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
|
178 | | |
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 | 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
|
180 | |\ 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
|
181 | | | 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
|
182 | | | 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
|
183 | | | 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
|
184 | | | 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
|
185 | | | 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
|
186 | | | |
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 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
|
188 |/ / 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
|
189 | | 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
|
190 | | 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
|
191 | | 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
|
192 | | 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
|
193 | | |
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 | 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
|
195 | | 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
|
196 | | 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
|
197 | | 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
|
198 | | 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
|
199 | | 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
|
200 | | |
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 | | @ 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
|
202 | | | 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
|
203 | | | 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
|
204 | | | 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
|
205 | | | 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
|
206 | | | |
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 | 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
|
208 | |/ 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
|
209 | | 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
|
210 | | 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
|
211 | | 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
|
212 | | |
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 | 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
|
214 | | 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
|
215 | | 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
|
216 | | 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
|
217 | | 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
|
218 | | |
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 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
|
220 | | 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
|
221 | | 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
|
222 | | 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
|
223 | | 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
|
224 | | |
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 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
|
226 |/ 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
|
227 | 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
|
228 | 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
|
229 | 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
|
230 | |
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 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
|
232 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
|
233 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
|
234 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
|
235 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
236 $ 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
|
237 rebase onto 4bc80088dc6b starting from e31216eec445 |
35384
b9bdee046cc2
tests: add a simple test for in-memory rebase
Phil Cohen <phillco@fb.com>
parents:
34865
diff
changeset
|
238 rebasing on disk |
31225
749b057b01f3
rebase: allow aborting if last-message.txt is missing
Durham Goode <durham@fb.com>
parents:
30460
diff
changeset
|
239 rebase status stored |
23517
4f18e80d9c30
rebase: show more useful status information while rebasing
Mads Kiilerich <madski@unity3d.com>
parents:
23516
diff
changeset
|
240 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
|
241 future parents are 2 and -1 |
ad9db007656f
rebase: fix selection of base used when rebasing merge (issue4041)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
18935
diff
changeset
|
242 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
|
243 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
|
244 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
|
245 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
|
246 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
|
247 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
|
248 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
|
249 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
|
250 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
|
251 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
|
252 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
|
253 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
|
254 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
|
255 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
|
256 getting f1.txt |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
257 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
|
258 f1.txt |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
259 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
260 committing changelog |
33139 | 261 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
|
262 rebased as 19c888675e13 |
37032
98663bed146e
rebase: store rebase state after each commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
36968
diff
changeset
|
263 rebase status stored |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
264 rebasing 10:2f2496ddf49d tip "merge" |
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
|
265 future parents are 11 and 7 |
32249
27e67cfea27f
rebase: rename "target" to "destination" in messages
Martin von Zweigbergk <martinvonz@google.com>
parents:
31226
diff
changeset
|
266 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
|
267 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
|
268 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
|
269 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
|
270 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
|
271 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
|
272 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
|
273 getting f1.txt |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
274 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
|
275 f1.txt |
23749
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
276 committing manifest |
a387b0390082
localrepo: show headline notes in commitctx before showing filenames
Mads Kiilerich <madski@unity3d.com>
parents:
23632
diff
changeset
|
277 committing changelog |
33139 | 278 updating the branch cache |
46679
d6fa9fbd375d
commit: reorder if-else conditional to give mergestate info priority
Pulkit Goyal <7895pulkit@gmail.com>
parents:
45916
diff
changeset
|
279 rebased as c1ffa3b5274e |
37032
98663bed146e
rebase: store rebase state after each commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
36968
diff
changeset
|
280 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
|
281 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
|
282 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
|
283 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
|
284 branchmerge: False, force: False, partial: False |
46679
d6fa9fbd375d
commit: reorder if-else conditional to give mergestate info priority
Pulkit Goyal <7895pulkit@gmail.com>
parents:
45916
diff
changeset
|
285 ancestor: c1ffa3b5274e, local: c1ffa3b5274e+, remote: d79e2059b5c0 |
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
|
286 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
|
287 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
|
288 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
|
289 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
|
290 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
|
291 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
|
292 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
|
293 2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2 |
36965
b89a7ef29013
bundle: include advisory rev branch cache part in bundle2 bundle
Boris Feld <boris.feld@octobus.net>
parents:
35393
diff
changeset
|
294 bundle2-output-bundle: "HG20", (1 params) 3 parts total |
29593
953839de96ab
bundle2: store changeset count when creating file bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28072
diff
changeset
|
295 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
37842
326b174c6a47
bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents:
37336
diff
changeset
|
296 bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
297 bundle2-output-part: "phase-heads" 24 bytes payload |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35384
diff
changeset
|
298 saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-rebase.hg |
50393
f95ab2c53303
outgoing: fix common-heads computation from `missingroots` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50381
diff
changeset
|
299 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
|
300 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
|
301 19c888675e133ab5dff84516926a65672eaf04d9 |
46679
d6fa9fbd375d
commit: reorder if-else conditional to give mergestate info priority
Pulkit Goyal <7895pulkit@gmail.com>
parents:
45916
diff
changeset
|
302 c1ffa3b5274e92a9388fe782854e295d2e8d0443 |
36965
b89a7ef29013
bundle: include advisory rev branch cache part in bundle2 bundle
Boris Feld <boris.feld@octobus.net>
parents:
35393
diff
changeset
|
303 bundle2-output-bundle: "HG20", 3 parts total |
29593
953839de96ab
bundle2: store changeset count when creating file bundles
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28072
diff
changeset
|
304 bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload |
37842
326b174c6a47
bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents:
37336
diff
changeset
|
305 bundle2-output-part: "cache:rev-branch-cache" (advisory) streamed payload |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
306 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
|
307 adding branch |
26922
34bba01a1355
test: use generaldelta in 'test-rebase-conflict.t'
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
26614
diff
changeset
|
308 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
|
309 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
|
310 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
|
311 add changeset 19c888675e13 |
46679
d6fa9fbd375d
commit: reorder if-else conditional to give mergestate info priority
Pulkit Goyal <7895pulkit@gmail.com>
parents:
45916
diff
changeset
|
312 add changeset c1ffa3b5274e |
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
|
313 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
|
314 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
|
315 adding f1.txt revisions |
50393
f95ab2c53303
outgoing: fix common-heads computation from `missingroots` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50381
diff
changeset
|
316 bundle2-input-part: total payload size 1255 |
37842
326b174c6a47
bundle2: mark the bundle2 part as advisory (issue5872)
Boris Feld <boris.feld@octobus.net>
parents:
37336
diff
changeset
|
317 bundle2-input-part: "cache:rev-branch-cache" (advisory) supported |
50393
f95ab2c53303
outgoing: fix common-heads computation from `missingroots` argument
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
50381
diff
changeset
|
318 bundle2-input-part: total payload size 54 |
33032
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
319 bundle2-input-part: "phase-heads" supported |
8e3021fd1a44
strip: include phases in bundle (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
32268
diff
changeset
|
320 bundle2-input-part: total payload size 24 |
42931
181ee2118a96
bundle2: fix an off-by-one in debug message of number of parts
Martin von Zweigbergk <martinvonz@google.com>
parents:
42897
diff
changeset
|
321 bundle2-input-bundle: 3 parts total |
46372
3e91d9978bec
branchmap: update rev-branch-cache incrementally
Joerg Sonnenberger <joerg@bec.de>
parents:
45916
diff
changeset
|
322 truncating cache/rbc-revs-v1 to 72 |
42897
d7304434390f
changegroup: move message about added changes to transaction summary
Pierre-Yves David <pierre-yves.david@octobus.net>
parents:
42602
diff
changeset
|
323 added 2 changesets with 2 changes to 1 files |
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
|
324 updating the branch cache |
42602
c7d236b55a3e
py3: fix formatting of branchmap log messages with repo.filtername=None
Martin von Zweigbergk <martinvonz@google.com>
parents:
42532
diff
changeset
|
325 invalid branch cache (served): tip differs |
c7d236b55a3e
py3: fix formatting of branchmap log messages with repo.filtername=None
Martin von Zweigbergk <martinvonz@google.com>
parents:
42532
diff
changeset
|
326 invalid branch cache (served.hidden): tip differs |
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
|
327 rebase completed |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
328 |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
329 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
|
330 $ hg up -q null |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
331 $ echo a > a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
332 $ hg add a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
333 $ 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
|
334 $ echo b >> a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
335 $ 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
|
336 $ hg bookmark ab |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
337 $ hg up -q '.^' |
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 $ echo c >> a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
340 $ 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
|
341 $ hg rebase -s 7bc217434fc1 -d ab --keep |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
342 rebasing 13:7bc217434fc1 tip "abc" |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
343 merging a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
344 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
45150
dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Daniel Ploch <dploch@google.com>
parents:
44347
diff
changeset
|
345 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
45826
21733e8c924f
errors: add config that lets user get more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
346 [240] |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
347 $ hg diff |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
348 diff -r 328e4ab1f7cc a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
349 --- 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
|
350 +++ b/a * (glob) |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
351 @@ -1,2 +1,6 @@ |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
352 a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
353 b |
30460
ce3a133f71b3
conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents:
30273
diff
changeset
|
354 +<<<<<<< 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
|
355 +======= |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
356 +c |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
357 +>>>>>>> source: 7bc217434fc1 - test: abc |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
358 $ hg rebase --abort |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
359 rebase aborted |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
360 $ 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
|
361 $ hg rebase -s . -d ab --keep -t internal:merge3 |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
362 rebasing 13:7bc217434fc1 tip "abc" |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
363 merging a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
364 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
45150
dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Daniel Ploch <dploch@google.com>
parents:
44347
diff
changeset
|
365 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
45826
21733e8c924f
errors: add config that lets user get more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
366 [240] |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
367 $ hg diff |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
368 diff -r 328e4ab1f7cc a |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
369 --- 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
|
370 +++ b/a * (glob) |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
371 @@ -1,2 +1,8 @@ |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
372 a |
48588
402a6b6173e9
rebase: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48584
diff
changeset
|
373 +<<<<<<< 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
|
374 b |
48588
402a6b6173e9
rebase: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48584
diff
changeset
|
375 +||||||| parent of source: cb9a9f314b8b - test: a |
28072
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
376 +======= |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
377 +b |
c3e9269d9602
merge: minimize conflicts when common base is not shown (issue4447)
Ryan McElroy <rmcelroy@fb.com>
parents:
27626
diff
changeset
|
378 +c |
48588
402a6b6173e9
rebase: set custom conflict label for base commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
48584
diff
changeset
|
379 +>>>>>>> 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
|
380 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
381 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
|
382 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
383 $ 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
|
384 $ 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
|
385 $ 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
|
386 $ 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
|
387 > D |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
388 > | |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
389 > C |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
390 > | |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
391 > 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
|
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 > A |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
394 > EOS |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
395 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
396 $ 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
|
397 $ 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
|
398 $ hg commit --amend -m E -A B -q |
34865
a0100f34e20b
config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
399 $ hg rebase -r B+D -d . --config experimental.evolution=true |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
400 rebasing 1:112478962961 B "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
|
401 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
|
402 warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
45150
dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Daniel Ploch <dploch@google.com>
parents:
44347
diff
changeset
|
403 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
45826
21733e8c924f
errors: add config that lets user get more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
404 [240] |
33034
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
405 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
406 $ 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
|
407 $ 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
|
408 (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
|
409 continue: hg rebase --continue |
34865
a0100f34e20b
config: replace experimental.stabilization by experimental.evolution
Boris Feld <boris.feld@octobus.net>
parents:
34661
diff
changeset
|
410 $ hg rebase --continue --config experimental.evolution=none |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
411 rebasing 1:112478962961 B "B" |
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
412 rebasing 3:f585351a92f8 D "D" |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
413 warning: orphaned descendants detected, not stripping 112478962961 |
35393
4441705b7111
tests: remove (glob) annotations that were only for '\' matches
Matt Harbison <matt_harbison@yahoo.com>
parents:
35384
diff
changeset
|
414 saved backup bundle to $TESTTMP/b/.hg/strip-backup/f585351a92f8-e536a9e4-rebase.hg |
33034
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
415 |
181ca34883e6
test-rebase-conflicts: add a test case about turning obsstore on and off
Jun Wu <quark@fb.com>
parents:
33032
diff
changeset
|
416 $ 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
|
417 $ hg tglog |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
418 o 5:draft 'D' |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
419 | |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
420 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
|
421 | |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
422 @ 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
|
423 | |
33332
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
424 | o 2:draft 'C' |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
425 | | |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
426 | o 1:draft 'B' |
3b7cb3d17137
rebase: use scmutil.cleanupnodes (issue5606) (BC)
Jun Wu <quark@fb.com>
parents:
33139
diff
changeset
|
427 |/ |
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 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
|
429 |
44342
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
430 |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
431 Test where the conflict happens when rebasing a merge commit |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
432 |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
433 $ cd $TESTTMP |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
434 $ hg init conflict-in-merge |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
435 $ cd conflict-in-merge |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
436 $ hg debugdrawdag <<'EOS' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
437 > F # F/conflict = foo\n |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
438 > |\ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
439 > D E |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
440 > |/ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
441 > C B # B/conflict = bar\n |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
442 > |/ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
443 > A |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
444 > EOS |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
445 |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
446 $ hg co F |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
447 5 files updated, 0 files merged, 0 files removed, 0 files unresolved |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
448 $ hg rebase -d B |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
449 rebasing 2:dc0947a82db8 C "C" |
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
450 rebasing 3:e7b3f00ed42e D "D" |
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
451 rebasing 4:03ca77807e91 E "E" |
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
452 rebasing 5:9a6b91dc2044 F tip "F" |
44342
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
453 merging conflict |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
454 warning: conflicts while merging conflict! (edit, then use 'hg resolve --mark') |
45150
dc5e5577af39
error: unify the error message formats for 'rebase' and 'unshelve'
Daniel Ploch <dploch@google.com>
parents:
44347
diff
changeset
|
455 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
45826
21733e8c924f
errors: add config that lets user get more detailed exit codes
Martin von Zweigbergk <martinvonz@google.com>
parents:
45771
diff
changeset
|
456 [240] |
44342
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
457 $ hg tglog |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
458 @ 8:draft 'E' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
459 | |
44347
9c9cfecd4600
rebase: don't use rebased node as dirstate p2 (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
44342
diff
changeset
|
460 | @ 7:draft 'D' |
44342
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
461 |/ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
462 o 6:draft 'C' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
463 | |
44347
9c9cfecd4600
rebase: don't use rebased node as dirstate p2 (BC)
Martin von Zweigbergk <martinvonz@google.com>
parents:
44342
diff
changeset
|
464 | % 5:draft 'F' |
44342
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
465 | |\ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
466 | | o 4:draft 'E' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
467 | | | |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
468 | o | 3:draft 'D' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
469 | |/ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
470 | o 2:draft 'C' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
471 | | |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
472 o | 1:draft 'B' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
473 |/ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
474 o 0:draft 'A' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
475 |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
476 $ echo baz > conflict |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
477 $ hg resolve -m |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
478 (no more unresolved files) |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
479 continue: hg rebase --continue |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
480 $ hg rebase -c |
45771
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
481 already rebased 2:dc0947a82db8 C "C" as 0199610c343e |
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
482 already rebased 3:e7b3f00ed42e D "D" as f0dd538aaa63 |
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
483 already rebased 4:03ca77807e91 E "E" as cbf25af8347d |
f90a5c211251
rebase: change and standarize template for rebase's one-line summary
Martin von Zweigbergk <martinvonz@google.com>
parents:
45150
diff
changeset
|
484 rebasing 5:9a6b91dc2044 F "F" |
44342
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
485 saved backup bundle to $TESTTMP/conflict-in-merge/.hg/strip-backup/dc0947a82db8-ca7e7d5b-rebase.hg |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
486 $ hg tglog |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
487 @ 5:draft 'F' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
488 |\ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
489 | o 4:draft 'E' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
490 | | |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
491 o | 3:draft 'D' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
492 |/ |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
493 o 2:draft 'C' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
494 | |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
495 o 1:draft 'B' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
496 | |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
497 o 0:draft 'A' |
7f7c8521e9bd
tests: add test of rebase with conflict in merge commit
Martin von Zweigbergk <martinvonz@google.com>
parents:
42931
diff
changeset
|
498 |