Mercurial > hg
changeset 26539:1956026e4db2
unbundle: properly read head modification result from bundle2
We were reading the wrong key...
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Sun, 04 Oct 2015 21:48:19 -0700 |
| parents | 5c9ec1cc671a |
| children | 7469067de2ba |
| files | mercurial/commands.py tests/test-bundle2-format.t |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Wed Oct 07 23:04:31 2015 +0900 +++ b/mercurial/commands.py Sun Oct 04 21:48:19 2015 -0700 @@ -6475,7 +6475,7 @@ finally: if tr: tr.release() - changes = [r.get('result', 0) + changes = [r.get('return', 0) for r in op.records['changegroup']] modheads = changegroup.combineresults(changes) else:
--- a/tests/test-bundle2-format.t Wed Oct 07 23:04:31 2015 +0900 +++ b/tests/test-bundle2-format.t Sun Oct 04 21:48:19 2015 -0700 @@ -997,6 +997,7 @@ adding manifests adding file changes added 0 changesets with 0 changes to 3 files + (run 'hg update' to get a working copy) with reply @@ -1125,6 +1126,7 @@ adding manifests adding file changes added 0 changesets with 0 changes to 3 files + (run 'hg update' to get a working copy) Simple case where it just work: BZ ---------------------------------- @@ -1211,6 +1213,7 @@ adding manifests adding file changes added 0 changesets with 0 changes to 3 files + (run 'hg update' to get a working copy) unknown compression while unbundling -----------------------------