Commit Graph

3 Commits

Author SHA1 Message Date
Thomas Arendsen Hein
978cbf5cbd Fixed OSError "No such file or directory: None" and make IOError consistent.
The None error occurs when the current working directory is no longer
available, e.g. because it was removed in another shell.
2006-09-11 10:23:23 +02:00
Thomas Arendsen Hein
46d0753ec7 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.
2006-05-02 18:44:02 +02:00
Eric Hopper
7bec817081 Test case for the misleading message on bad permissions. 2005-09-27 14:59:02 -07:00