changeset 43642 | 96edd0c38740 |
parent 43506 | 9f70512ae2cf |
child 43903 | d50b4ad1d4a5 |
--- a/hgext/transplant.py Thu Nov 14 15:25:48 2019 -0500 +++ b/hgext/transplant.py Thu Nov 14 15:25:57 2019 -0500 @@ -443,7 +443,13 @@ ) if merge: repo.setparents(p1, parents[1]) - modified, added, removed, deleted = repo.status()[:4] + st = repo.status() + modified, added, removed, deleted = ( + st.modified, + st.added, + st.removed, + st.deleted, + ) if merge or modified or added or removed or deleted: n = repo.commit( message,