5 Commits

Author	SHA1	Message	Date
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
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	ee0f69d039	[PATCH] Removal of a file added by merging branches ... -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----	2005-06-21 19:19:39 -08:00