Mercurial > hg
annotate tests/test-rebase-newancestor.t @ 23499:b46876c94a93
obsstore: cache size computation for fm1 node
We have two different types of node type (sha1 and sha256, only sha1 is used
now) and therefor different sizes for them. We now compute the value once
instead of redoing the computation every loop. This has no visible performance
impact.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Wed, 26 Nov 2014 23:23:33 -0800 |
parents | 19ebd2f88fc7 |
children | 328afbad6e57 |
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= |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
4 > |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
5 > [alias] |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
6 > tglog = log -G --template "{rev}: '{desc}' {branches}\n" |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
7 > EOF |
11198
b345b1cc124f
rebase: use helpers.sh in tests
Matt Mackall <mpm@selenic.com>
parents:
9815
diff
changeset
|
8 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
9 $ hg init repo |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
10 $ cd repo |
9815
49efeed49c94
rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff
changeset
|
11 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
12 $ echo A > a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
13 $ echo >> a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
14 $ hg ci -Am A |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
15 adding a |
9815
49efeed49c94
rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff
changeset
|
16 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
17 $ echo B > a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
18 $ echo >> a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
19 $ hg ci -m B |
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 C > a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
22 $ echo >> a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
23 $ hg ci -m C |
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 0 |
9815
49efeed49c94
rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff
changeset
|
26 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
27 $ echo D >> a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
28 $ hg ci -Am AD |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
29 created new head |
9815
49efeed49c94
rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff
changeset
|
30 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
31 $ hg tglog |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
32 @ 3: 'AD' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
33 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
34 | o 2: 'C' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
35 | | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
36 | o 1: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
37 |/ |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
38 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
39 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
40 $ hg rebase -s 1 -d 3 |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
41 merging a |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
42 merging a |
12640
6cc4b14fb76b
tests: remove redundant globs
Mads Kiilerich <mads@kiilerich.com>
parents:
12608
diff
changeset
|
43 saved backup bundle to $TESTTMP/repo/.hg/strip-backup/*-backup.hg (glob) |
9815
49efeed49c94
rebase: make sure the newancestor is used during the whole update
Christian Boos <cboos@bct-technology.com>
parents:
diff
changeset
|
44 |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
45 $ hg tglog |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16913
diff
changeset
|
46 o 3: 'C' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
47 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
48 o 2: 'B' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
49 | |
19925
9c78ed396075
rebase: preserve working directory parent (BC)
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
16913
diff
changeset
|
50 @ 1: 'AD' |
12608
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
51 | |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
52 o 0: 'A' |
16b854cb80f1
tests: unify test-rebase*
Adrian Buehlmann <adrian@cadifra.com>
parents:
11208
diff
changeset
|
53 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
54 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
12640
diff
changeset
|
55 $ cd .. |
23406
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
56 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
57 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
58 Test rebasing of merges with ancestors of the rebase destination - a situation |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
59 that often happens when trying to recover from repeated merging with a mainline |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
60 branch. |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
61 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
62 The test case creates a dev branch that contains a couple of merges from the |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
63 default branch. When rebasing to the default branch, these merges would be |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
64 merges with ancestors on the same branch. The merges _could_ contain some |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
65 interesting conflict resolutions or additional changes in the merge commit, but |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
66 that is mixed up with the actual merge stuff and there is in general no way to |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
67 separate them. |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
68 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
69 Note: The dev branch contains _no_ changes to f-default. It might be unclear |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
70 how rebasing of ancestor merges should be handled, but the current behavior |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
71 with spurious prompts for conflicts in files that didn't change seems very |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
72 wrong. |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
73 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
74 $ hg init ancestor-merge |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
75 $ cd ancestor-merge |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
76 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
77 $ touch f-default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
78 $ hg ci -Aqm 'default: create f-default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
79 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
80 $ hg branch -q dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
81 $ hg ci -qm 'dev: create branch' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
82 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
83 $ echo stuff > f-dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
84 $ hg ci -Aqm 'dev: f-dev stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
85 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
86 $ hg up -q default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
87 $ echo stuff > f-default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
88 $ hg ci -m 'default: f-default stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
89 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
90 $ hg up -q dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
91 $ hg merge -q default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
92 $ hg ci -m 'dev: merge default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
93 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
94 $ hg up -q default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
95 $ hg rm f-default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
96 $ hg ci -m 'default: remove f-default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
97 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
98 $ hg up -q dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
99 $ hg merge -q default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
100 $ hg ci -m 'dev: merge default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
101 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
102 $ hg up -q default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
103 $ echo stuff > f-other |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
104 $ hg ci -Aqm 'default: f-other stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
105 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
106 $ hg tglog |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
107 @ 7: 'default: f-other stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
108 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
109 | o 6: 'dev: merge default' dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
110 |/| |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
111 o | 5: 'default: remove f-default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
112 | | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
113 | o 4: 'dev: merge default' dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
114 |/| |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
115 o | 3: 'default: f-default stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
116 | | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
117 | o 2: 'dev: f-dev stuff' dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
118 | | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
119 | o 1: 'dev: create branch' dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
120 |/ |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
121 o 0: 'default: create f-default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
122 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
123 $ hg clone -qU . ../ancestor-merge-2 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
124 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
125 Full rebase all the way back from branching point: |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
126 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
127 $ hg rebase -r 'only(dev,default)' -d default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
128 remote changed f-default which local deleted |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
129 use (c)hanged version or leave (d)eleted? c |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
130 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-backup.hg (glob) |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
131 $ hg tglog |
23426 | 132 o 6: 'dev: merge default' |
133 | | |
23406
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
134 o 5: 'dev: merge default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
135 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
136 o 4: 'dev: f-dev stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
137 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
138 @ 3: 'default: f-other stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
139 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
140 o 2: 'default: remove f-default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
141 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
142 o 1: 'default: f-default stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
143 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
144 o 0: 'default: create f-default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
145 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
146 Grafty cherry picking rebasing: |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
147 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
148 $ cd ../ancestor-merge-2 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
149 |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
150 $ hg phase -fdr0: |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
151 $ hg rebase -r 'children(only(dev,default))' -d default |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
152 remote changed f-default which local deleted |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
153 use (c)hanged version or leave (d)eleted? c |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
154 saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-backup.hg (glob) |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
155 $ hg tglog |
23426 | 156 o 7: 'dev: merge default' |
157 | | |
23406
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
158 o 6: 'dev: merge default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
159 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
160 o 5: 'dev: f-dev stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
161 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
162 o 4: 'default: f-other stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
163 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
164 o 3: 'default: remove f-default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
165 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
166 o 2: 'default: f-default stuff' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
167 | |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
168 | o 1: 'dev: create branch' dev |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
169 |/ |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
170 o 0: 'default: create f-default' |
65f215ea3e8e
tests: add test for rebasing merges with ancestors of the rebase destination
Mads Kiilerich <madski@unity3d.com>
parents:
20117
diff
changeset
|
171 |
23407
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
172 $ cd .. |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
173 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
174 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
175 Test order of parents of rebased merged with un-rebased changes as p1. |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
176 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
177 $ hg init parentorder |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
178 $ cd parentorder |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
179 $ touch f |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
180 $ hg ci -Aqm common |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
181 $ touch change |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
182 $ hg ci -Aqm change |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
183 $ touch target |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
184 $ hg ci -Aqm target |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
185 $ hg up -qr 0 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
186 $ touch outside |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
187 $ hg ci -Aqm outside |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
188 $ hg merge -qr 1 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
189 $ hg ci -m 'merge p1 3=outside p2 1=ancestor' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
190 $ hg par |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
191 changeset: 4:6990226659be |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
192 tag: tip |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
193 parent: 3:f59da8fc0fcf |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
194 parent: 1:dd40c13f7a6f |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
195 user: test |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
196 date: Thu Jan 01 00:00:00 1970 +0000 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
197 summary: merge p1 3=outside p2 1=ancestor |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
198 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
199 $ hg up -qr 1 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
200 $ hg merge -qr 3 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
201 $ hg ci -qm 'merge p1 1=ancestor p2 3=outside' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
202 $ hg par |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
203 changeset: 5:a57575f79074 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
204 tag: tip |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
205 parent: 1:dd40c13f7a6f |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
206 parent: 3:f59da8fc0fcf |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
207 user: test |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
208 date: Thu Jan 01 00:00:00 1970 +0000 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
209 summary: merge p1 1=ancestor p2 3=outside |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
210 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
211 $ hg tglog |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
212 @ 5: 'merge p1 1=ancestor p2 3=outside' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
213 |\ |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
214 +---o 4: 'merge p1 3=outside p2 1=ancestor' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
215 | |/ |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
216 | o 3: 'outside' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
217 | | |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
218 +---o 2: 'target' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
219 | | |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
220 o | 1: 'change' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
221 |/ |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
222 o 0: 'common' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
223 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
224 $ hg rebase -r 4 -d 2 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
225 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/6990226659be-backup.hg (glob) |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
226 $ hg tip |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
227 changeset: 5:cca50676b1c5 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
228 tag: tip |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
229 parent: 2:a60552eb93fb |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
230 parent: 3:f59da8fc0fcf |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
231 user: test |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
232 date: Thu Jan 01 00:00:00 1970 +0000 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
233 summary: merge p1 3=outside p2 1=ancestor |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
234 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
235 $ hg rebase -r 4 -d 2 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
236 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/a57575f79074-backup.hg (glob) |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
237 $ hg tip |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
238 changeset: 5:f9daf77ffe76 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
239 tag: tip |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
240 parent: 2:a60552eb93fb |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
241 parent: 3:f59da8fc0fcf |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
242 user: test |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
243 date: Thu Jan 01 00:00:00 1970 +0000 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
244 summary: merge p1 1=ancestor p2 3=outside |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
245 |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
246 $ hg tglog |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
247 @ 5: 'merge p1 1=ancestor p2 3=outside' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
248 |\ |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
249 +---o 4: 'merge p1 3=outside p2 1=ancestor' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
250 | |/ |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
251 | o 3: 'outside' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
252 | | |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
253 o | 2: 'target' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
254 | | |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
255 o | 1: 'change' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
256 |/ |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
257 o 0: 'common' |
06b6867d853f
tests: test coverage of parent order with p1 outside rebase set
Mads Kiilerich <madski@unity3d.com>
parents:
23406
diff
changeset
|
258 |
23408
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
259 rebase of merge of ancestors |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
260 |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
261 $ hg up -qr 2 |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
262 $ hg merge -qr 3 |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
263 $ echo 'other change while merging future "rebase ancestors"' > other |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
264 $ hg ci -Aqm 'merge rebase ancestors' |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
265 $ hg rebase -d 5 -v |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
266 resolving manifests |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
267 removing other |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
268 note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
269 |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
270 calculating bids for ancestor a60552eb93fb |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
271 resolving manifests |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
272 |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
273 calculating bids for ancestor f59da8fc0fcf |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
274 resolving manifests |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
275 |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
276 auction for merging merge bids |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
277 other: consensus for g |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
278 end of auction |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
279 |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
280 getting other |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
281 other |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
282 rebase merging completed |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
283 1 changesets found |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
284 saved backup bundle to $TESTTMP/parentorder/.hg/strip-backup/4c5f12f25ebe-backup.hg (glob) |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
285 1 changesets found |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
286 adding branch |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
287 adding changesets |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
288 adding manifests |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
289 adding file changes |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
290 added 1 changesets with 1 changes to 1 files |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
291 rebase completed |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
292 $ hg tglog |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
293 @ 6: 'merge rebase ancestors' |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
294 | |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
295 o 5: 'merge p1 1=ancestor p2 3=outside' |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
296 |\ |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
297 +---o 4: 'merge p1 3=outside p2 1=ancestor' |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
298 | |/ |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
299 | o 3: 'outside' |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
300 | | |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
301 o | 2: 'target' |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
302 | | |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
303 o | 1: 'change' |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
304 |/ |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
305 o 0: 'common' |
36dcd3db70ab
tests: test rebase of merge of target ancestors
Mads Kiilerich <madski@unity3d.com>
parents:
23407
diff
changeset
|
306 |