Mercurial > public > mercurial-scm > hg
diff mercurial/cmdutil.py @ 14257:d035ede73434
mq: explicitly updatedir() even if patch() fails
It already works that way in practice, and we intend to merge updatedir() into
patch().
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 08 May 2011 17:48:29 +0200 |
parents | f4766e1bb0b3 |
children | df9ccd39828c |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Fri May 06 19:55:46 2011 +0300 +++ b/mercurial/cmdutil.py Sun May 08 17:48:29 2011 +0200 @@ -335,7 +335,7 @@ def updatedir(ui, repo, patches, similarity=0): '''Update dirstate after patch application according to metadata''' if not patches: - return + return [] copies = [] removes = set() cfiles = patches.keys()