##// END OF EJS Templates
fix strip'ping the second parent of a merge
Alexis S. L. Carvalho -
r4065:8ee983e3 default
parent child Browse files
Show More
@@ -678,9 +678,10 b' class queue:'
678 678 while True:
679 679 seen[n] = 1
680 680 pp = chlog.parents(n)
681 if pp[1] != revlog.nullid and chlog.rev(pp[1]) > revnum:
682 if pp[1] not in seen:
683 heads.append(pp[1])
681 if pp[1] != revlog.nullid:
682 for p in pp:
683 if chlog.rev(p) > revnum and p not in seen:
684 heads.append(p)
684 685 if pp[0] == revlog.nullid:
685 686 break
686 687 if chlog.rev(pp[0]) < revnum:
@@ -246,3 +246,22 b' hg mv bleh barney'
246 246 hg qrefresh --git
247 247 cat .hg/patches/bar
248 248 hg log -vC --template '{rev} {file_copies%filecopy}\n' -r .
249
250 echo '% strip again'
251 cd ..
252 hg init strip
253 cd strip
254 touch foo
255 hg add foo
256 hg ci -m 'add foo' -d '0 0'
257 echo >> foo
258 hg ci -m 'change foo 1' -d '0 0'
259 hg up -C 0
260 echo 1 >> foo
261 hg ci -m 'change foo 2' -d '0 0'
262 HGMERGE=true hg merge
263 hg ci -m merge -d '0 0'
264 hg log
265 hg strip 1 2>&1 | sed 's/\(saving bundle to \).*/\1/'
266 hg log
267
@@ -264,3 +264,52 b' new file mode 100644'
264 264 @@ -0,0 +1,1 @@
265 265 +bar
266 266 3 barney (foo)
267 % strip again
268 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
269 merging foo
270 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
271 (branch merge, don't forget to commit)
272 changeset: 3:99615015637b
273 tag: tip
274 parent: 2:20cbbe65cff7
275 parent: 1:d2871fc282d4
276 user: test
277 date: Thu Jan 01 00:00:00 1970 +0000
278 summary: merge
279
280 changeset: 2:20cbbe65cff7
281 parent: 0:53245c60e682
282 user: test
283 date: Thu Jan 01 00:00:00 1970 +0000
284 summary: change foo 2
285
286 changeset: 1:d2871fc282d4
287 user: test
288 date: Thu Jan 01 00:00:00 1970 +0000
289 summary: change foo 1
290
291 changeset: 0:53245c60e682
292 user: test
293 date: Thu Jan 01 00:00:00 1970 +0000
294 summary: add foo
295
296 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
297 saving bundle to
298 saving bundle to
299 adding branch
300 adding changesets
301 adding manifests
302 adding file changes
303 added 1 changesets with 1 changes to 1 files
304 (run 'hg update' to get a working copy)
305 changeset: 1:20cbbe65cff7
306 tag: tip
307 user: test
308 date: Thu Jan 01 00:00:00 1970 +0000
309 summary: change foo 2
310
311 changeset: 0:53245c60e682
312 user: test
313 date: Thu Jan 01 00:00:00 1970 +0000
314 summary: add foo
315
General Comments 0
You need to be logged in to leave comments. Login now