sapling/tests/test-empty-dir.out

321
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
sub/b not present
sub not present
Remove empty directories on update -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Remove empty directories on update manifest hash: 113969ec14c75eb9e1013b23cf096f722932b84d -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxyVoywK+sNU5EO8RAklKAKCzSUhuFClkHN85qlnDp5iVscZbtgCeJVwx dqaqG20GjPMWBg0d1ggI/ro= =o2Uv -----END PGP SIGNATURE----- 2005-07-03 03:38:16 +04:00			`321`
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 20:44:02 +04:00			`0 files updated, 0 files merged, 1 files removed, 0 files unresolved`
changes by John Levon to standardize some erroroutput 2006-02-22 17:57:43 +03:00			`sub/b not present`
			`sub not present`