Mercurial > hg
comparison mercurial/merge.py @ 26975:6618dfd3ea1c
merge.applyupdates: don't return early if merge driver's conclude failed
Somewhat silly oversight -- this prevented the progress bar from being reset.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sun, 15 Nov 2015 22:45:20 -0800 |
| parents | fa2daf0e61ab |
| children | 1ee5e48f09d4 |
comparison
equal
deleted
inserted
replaced
| 26974:4b5dc0d9e899 | 26975:6618dfd3ea1c |
|---|---|
| 1012 | 1012 |
| 1013 if usemergedriver and not unresolved and ms.mdstate() != 's': | 1013 if usemergedriver and not unresolved and ms.mdstate() != 's': |
| 1014 if not driverconclude(repo, ms, wctx, labels=labels): | 1014 if not driverconclude(repo, ms, wctx, labels=labels): |
| 1015 # XXX setting unresolved to at least 1 is a hack to make sure we | 1015 # XXX setting unresolved to at least 1 is a hack to make sure we |
| 1016 # error out | 1016 # error out |
| 1017 return updated, merged, removed, max(unresolved, 1) | 1017 unresolved = max(unresolved, 1) |
| 1018 | 1018 |
| 1019 ms.commit() | 1019 ms.commit() |
| 1020 | 1020 |
| 1021 progress(_updating, None, total=numupdates, unit=_files) | 1021 progress(_updating, None, total=numupdates, unit=_files) |
| 1022 | 1022 |