66 merges with ancestors on the same branch. The merges _could_ contain some |
66 merges with ancestors on the same branch. The merges _could_ contain some |
67 interesting conflict resolutions or additional changes in the merge commit, but |
67 interesting conflict resolutions or additional changes in the merge commit, but |
68 that is mixed up with the actual merge stuff and there is in general no way to |
68 that is mixed up with the actual merge stuff and there is in general no way to |
69 separate them. |
69 separate them. |
70 |
70 |
71 Note: The dev branch contains _no_ changes to f-default. It might be unclear |
|
72 how rebasing of ancestor merges should be handled, but the current behavior |
|
73 with spurious prompts for conflicts in files that didn't change seems very |
|
74 wrong. |
|
75 |
|
76 $ hg init ancestor-merge |
71 $ hg init ancestor-merge |
77 $ cd ancestor-merge |
72 $ cd ancestor-merge |
78 |
73 |
79 $ touch f-default |
74 $ touch f-default |
80 $ hg ci -Aqm 'default: create f-default' |
75 $ hg ci -Aqm 'default: create f-default' |
131 > EOF |
126 > EOF |
132 rebasing 1:1d1a643d390e "dev: create branch" |
127 rebasing 1:1d1a643d390e "dev: create branch" |
133 note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes |
128 note: not rebasing 1:1d1a643d390e "dev: create branch", its destination already has all its changes |
134 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
129 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
135 rebasing 4:4b019212aaf6 "dev: merge default" |
130 rebasing 4:4b019212aaf6 "dev: merge default" |
136 file 'f-default' was deleted in local [dest] but was modified in other [source]. |
131 note: not rebasing 4:4b019212aaf6 "dev: merge default", its destination already has all its changes |
137 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
|
138 What do you want to do? c |
|
139 rebasing 6:010ced67e558 "dev: merge default" |
132 rebasing 6:010ced67e558 "dev: merge default" |
|
133 note: not rebasing 6:010ced67e558 "dev: merge default", its destination already has all its changes |
140 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-4a6f6d17-rebase.hg |
134 saved backup bundle to $TESTTMP/ancestor-merge/.hg/strip-backup/1d1a643d390e-4a6f6d17-rebase.hg |
141 $ hg tglog |
135 $ hg tglog |
142 o 6: de147e4f69cf 'dev: merge default' |
|
143 | |
|
144 o 5: eda7b7f46f5d 'dev: merge default' |
|
145 | |
|
146 o 4: 3e075b1c0a40 'dev: f-dev stuff' |
136 o 4: 3e075b1c0a40 'dev: f-dev stuff' |
147 | |
137 | |
148 @ 3: e08089805d82 'default: f-other stuff' |
138 @ 3: e08089805d82 'default: f-other stuff' |
149 | |
139 | |
150 o 2: 462860db70a1 'default: remove f-default' |
140 o 2: 462860db70a1 'default: remove f-default' |
161 $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF |
151 $ hg rebase -r 'children(only(dev,default))' -d default --config ui.interactive=True << EOF |
162 > c |
152 > c |
163 > EOF |
153 > EOF |
164 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
154 rebasing 2:ec2c14fb2984 "dev: f-dev stuff" |
165 rebasing 4:4b019212aaf6 "dev: merge default" |
155 rebasing 4:4b019212aaf6 "dev: merge default" |
166 file 'f-default' was deleted in local [dest] but was modified in other [source]. |
156 abort: rebasing 4:4b019212aaf6 will include unwanted changes from 1:1d1a643d390e |
167 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
157 [255] |
168 What do you want to do? c |
|
169 rebasing 6:010ced67e558 "dev: merge default" |
|
170 saved backup bundle to $TESTTMP/ancestor-merge-2/.hg/strip-backup/ec2c14fb2984-827d7a44-rebase.hg |
|
171 $ hg tglog |
|
172 o 7: de147e4f69cf 'dev: merge default' |
|
173 | |
|
174 o 6: eda7b7f46f5d 'dev: merge default' |
|
175 | |
|
176 o 5: 3e075b1c0a40 'dev: f-dev stuff' |
|
177 | |
|
178 o 4: e08089805d82 'default: f-other stuff' |
|
179 | |
|
180 o 3: 462860db70a1 'default: remove f-default' |
|
181 | |
|
182 o 2: f157ecfd2b6b 'default: f-default stuff' |
|
183 | |
|
184 | o 1: 1d1a643d390e 'dev: create branch' dev |
|
185 |/ |
|
186 o 0: e90e8eb90b6f 'default: create f-default' |
|
187 |
|
188 $ cd .. |
158 $ cd .. |
189 |
159 |
190 |
160 |
191 Test order of parents of rebased merged with un-rebased changes as p1. |
161 Test order of parents of rebased merged with un-rebased changes as p1. |
192 |
162 |
282 $ hg ci -Aqm 'merge rebase ancestors' |
252 $ hg ci -Aqm 'merge rebase ancestors' |
283 $ hg rebase -d 5 -v |
253 $ hg rebase -d 5 -v |
284 rebasing 6:4c5f12f25ebe "merge rebase ancestors" (tip) |
254 rebasing 6:4c5f12f25ebe "merge rebase ancestors" (tip) |
285 resolving manifests |
255 resolving manifests |
286 removing other |
256 removing other |
287 note: merging f9daf77ffe76+ and 4c5f12f25ebe using bids from ancestors a60552eb93fb and f59da8fc0fcf |
|
288 |
|
289 calculating bids for ancestor a60552eb93fb |
|
290 resolving manifests |
257 resolving manifests |
291 |
|
292 calculating bids for ancestor f59da8fc0fcf |
|
293 resolving manifests |
|
294 |
|
295 auction for merging merge bids |
|
296 other: consensus for g |
|
297 end of auction |
|
298 |
|
299 getting other |
258 getting other |
300 committing files: |
259 committing files: |
301 other |
260 other |
302 committing manifest |
261 committing manifest |
303 committing changelog |
262 committing changelog |