Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
Showing
- mercurial/commands.py 3 additions, 2 deletionsmercurial/commands.py
- mercurial/localrepo.py 22 additions, 9 deletionsmercurial/localrepo.py
- tests/test-backout.out 2 additions, 0 deletionstests/test-backout.out
- tests/test-backwards-remove.out 1 addition, 0 deletionstests/test-backwards-remove.out
- tests/test-clone-pull-corruption.out 1 addition, 0 deletionstests/test-clone-pull-corruption.out
- tests/test-clone-r.out 11 additions, 0 deletionstests/test-clone-r.out
- tests/test-clone.out 2 additions, 0 deletionstests/test-clone.out
- tests/test-conflict.out 5 additions, 0 deletionstests/test-conflict.out
- tests/test-confused-revert.out 4 additions, 0 deletionstests/test-confused-revert.out
- tests/test-empty-dir.out 1 addition, 0 deletionstests/test-empty-dir.out
- tests/test-encode.out 1 addition, 0 deletionstests/test-encode.out
- tests/test-excessive-merge.out 6 additions, 0 deletionstests/test-excessive-merge.out
- tests/test-filebranch.out 1 addition, 0 deletionstests/test-filebranch.out
- tests/test-flags.out 1 addition, 0 deletionstests/test-flags.out
- tests/test-hook.out 4 additions, 0 deletionstests/test-hook.out
- tests/test-lock-badness.out 1 addition, 0 deletionstests/test-lock-badness.out
- tests/test-merge-revert.out 5 additions, 0 deletionstests/test-merge-revert.out
- tests/test-merge-revert2.out 6 additions, 0 deletionstests/test-merge-revert2.out
- tests/test-merge1.out 12 additions, 0 deletionstests/test-merge1.out
- tests/test-merge2.out 3 additions, 0 deletionstests/test-merge2.out
Loading
Please register or sign in to comment