merge: move cd/dc prompts after largefiles prompts
By moving the cd/dc prompts out of calculateupdates(), we let largefiles' overridecalculateupdates() so the unresolved values (i.e. 'cd' or 'dc' rather than 'g', 'r', 'a' and missing). This allows overridecalculateupdates() to ask the user whether to keep the normal file or the largefile before the user gets the cd/dc prompt. Whichever answer the user gives, we make overridecalculateupdates() replace 'cd' or 'dc' action, saving the user one annoying (and less clear) question.
Showing
- hgext/largefiles/overrides.py 8 additions, 4 deletionshgext/largefiles/overrides.py
- mercurial/merge.py 20 additions, 20 deletionsmercurial/merge.py
- tests/test-issue3084.t 8 additions, 42 deletionstests/test-issue3084.t
- tests/test-largefiles-update.t 0 additions, 9 deletionstests/test-largefiles-update.t
Loading
Please register or sign in to comment