Mercurial > hg
comparison tests/test-graft.t @ 21200:a1381eea7c7d stable
graft: do not use `.remove` on a smart set (regression)
Revset calls use to return a list. Graft use to mutate that list. We cannot do
this anymore leading to a crash when grafting multiple changeset with a revset.
File ".../mercurial/commands.py", line 3117, in graft
revs.remove(rev)
AttributeError: '_addset' object has no attribute 'remove'
We are late in code-freeze so we make the shortest possible fix by turning it
back to a list.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 28 Apr 2014 17:25:36 -0700 |
parents | 0d67fccc0d43 |
children | 19d6fec60b81 |
comparison
equal
deleted
inserted
replaced
21199:e9c2f76be74b | 21200:a1381eea7c7d |
---|---|
569 tag: tip | 569 tag: tip |
570 user: foo | 570 user: foo |
571 date: Thu Jan 01 00:00:00 1970 +0000 | 571 date: Thu Jan 01 00:00:00 1970 +0000 |
572 summary: 2 | 572 summary: 2 |
573 | 573 |
574 | |
575 graft works on complex revset | |
576 | |
577 $ hg graft 'origin(13) or destination(origin(13))' | |
578 skipping ancestor revision 21 | |
579 skipping ancestor revision 22 | |
580 skipping revision 2 (already grafted to 22) | |
581 grafting revision 7 | |
582 grafting revision 13 | |
583 grafting revision 19 | |
584 merging b |