diff mercurial/repair.py @ 10048:46de82e50790 stable

mq: qpop: remove added files before re-adding removed files We need to do this to avoid file/directories conflicts. This causes patches removing a committed file and replacing it with a directory to be "unpoppable".
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Fri, 11 Dec 2009 15:09:52 +0900
parents 09a1ee498756
children 25e572394f5c
line wrap: on
line diff