Commit Graph

7 Commits

Author SHA1 Message Date
Dirkjan Ochtman
3e3b0d62eb warn about new heads on commit (issue842) 2008-03-21 11:06:02 +01: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
mpm@selenic.com
ea7bd9ea6f run-tests: remove '+ hg' trick
This was causing me a fair amount of debugging confusion. Let's just
forget it entirely. Updated tests to match.
2005-08-16 19:03:01 -08:00
Thomas Arendsen Hein
87aabef405 Updated output of tests. 2005-07-29 15:21:02 +01:00
Bryan O'Sullivan
6870215310 Update tests to match new addremove chattiness. 2005-07-22 19:46:02 -08:00
mpm@selenic.com
3a08ca5eaa Update tests to use commit -m and default -u
manifest hash: 6e4385453843031a712005a320d6000595b40d05
2005-07-21 15:05:17 -05:00
mpm@selenic.com
e1e034ba85 Pick up tests from previous patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Pick up tests from previous patch

manifest hash: 3ec4c3cb96e15322f7489d89b7b92ee214f6cfb9
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCuNIaywK+sNU5EO8RAuGOAJ9YXXfXstC6wysknsXPAL9jDeiUDwCgpFJ3
P5goy7Zw3ypinBEwZrhgXM8=
=6fKs
-----END PGP SIGNATURE-----
2005-06-21 18:51:06 -08:00