##// END OF EJS Templates
discovery: prevent crash caused by prune marker having no parent data...
Yuya Nishihara -
r32096:c52728b3 stable
parent child Browse files
Show More
@@ -511,7 +511,7 b' def pushingmarkerfor(obsstore, pushset, '
511 for m in markers:
511 for m in markers:
512 nexts = m[1] # successors
512 nexts = m[1] # successors
513 if not nexts: # this is a prune marker
513 if not nexts: # this is a prune marker
514 nexts = m[5] # parents
514 nexts = m[5] or () # parents
515 for n in nexts:
515 for n in nexts:
516 if n not in seen:
516 if n not in seen:
517 seen.add(n)
517 seen.add(n)
@@ -281,3 +281,32 b' Pulling the missing data makes it work'
281 adding manifests
281 adding manifests
282 adding file changes
282 adding file changes
283 added 1 changesets with 1 changes to 1 files (+1 heads)
283 added 1 changesets with 1 changes to 1 files (+1 heads)
284
285 Old head is pruned without parent data and new unrelated head added
286 ===================================================================
287
288 setup
289
290 $ cd ..
291 $ rm -R remote local
292 $ cp -R backup1 remote
293 $ hg clone remote local -qr c70b08862e08
294 $ cd local
295 $ hg up -q '.^'
296 $ mkcommit new-unrelated
297 created new head
298 $ hg debugobsolete `getid old`
299 $ hg log -G --hidden
300 @ 350a93b716be (draft) add new-unrelated
301 |
302 | x c70b08862e08 (draft) add old
303 |/
304 o b4952fcf48cf (public) add base
305
306
307 $ hg push
308 pushing to $TESTTMP/remote (glob)
309 searching for changes
310 abort: push creates new remote head 350a93b716be!
311 (merge or see 'hg help push' for details about pushing new heads)
312 [255]
General Comments 0
You need to be logged in to leave comments. Login now