Show More
@@ -2001,7 +2001,7 b' class queue(object):' | |||||
2001 | base = repo.changelog.node(rev.first()) |
|
2001 | base = repo.changelog.node(rev.first()) | |
2002 | if base in [n.node for n in self.applied]: |
|
2002 | if base in [n.node for n in self.applied]: | |
2003 | raise util.Abort(_('revision %d is already managed') |
|
2003 | raise util.Abort(_('revision %d is already managed') | |
2004 |
% rev |
|
2004 | % rev.first()) | |
2005 | if heads != [self.applied[-1].node]: |
|
2005 | if heads != [self.applied[-1].node]: | |
2006 | raise util.Abort(_('revision %d is not the parent of ' |
|
2006 | raise util.Abort(_('revision %d is not the parent of ' | |
2007 | 'the queue') % rev.first()) |
|
2007 | 'the queue') % rev.first()) |
@@ -1596,4 +1596,11 b' Test interraction with revset (issue4426' | |||||
1596 | $ hg ci -m a |
|
1596 | $ hg ci -m a | |
1597 | $ hg qimport -r 0:: |
|
1597 | $ hg qimport -r 0:: | |
1598 |
|
1598 | |||
|
1599 | reimport things | |||
|
1600 | ||||
|
1601 | $ hg qimport -r 1:: | |||
|
1602 | abort: revision 2 is already managed | |||
|
1603 | [255] | |||
|
1604 | ||||
|
1605 | ||||
1599 |
$ |
|
1606 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now