equal
deleted
inserted
replaced
1999 'branch') % rev.last()) |
1999 'branch') % rev.last()) |
2000 if self.applied: |
2000 if self.applied: |
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[0]) |
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()) |
2008 base = repo.changelog.rev(self.applied[0].node) |
2008 base = repo.changelog.rev(self.applied[0].node) |
2009 lastparent = repo.changelog.parentrevs(base)[0] |
2009 lastparent = repo.changelog.parentrevs(base)[0] |