changeset 42347 | 6310180662f5 |
parent 42339 | c0e1ea0c4cee |
child 42349 | ffab9eed3921 |
--- a/mercurial/localrepo.py Wed Apr 24 09:39:40 2019 -0700 +++ b/mercurial/localrepo.py Tue May 14 16:30:38 2019 -0700 @@ -2641,8 +2641,8 @@ raise # update manifest - removed = [f for f in sorted(removed) if f in m1 or f in m2] - drop = [f for f in removed if f in m] + removed = [f for f in removed if f in m1 or f in m2] + drop = sorted([f for f in removed if f in m]) for f in drop: del m[f] files = changed + removed