Commit Graph

7 Commits

Author SHA1 Message Date
Ronny Pfannschmidt
d170b686d2 filelog: sort meta entries, ensure deterministic order 2010-02-16 21:04:04 +01:00
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
Thomas Arendsen Hein
cc2267150a Show repo's revlog format on verify only if it doesn't match the default format.
This makes it easier to run the tests with different revlog formats.
2006-04-28 21:52:08 +02:00
Thomas Arendsen Hein
f48347c44f Show repo's revlog format on verify. Warn if some files use a different format. 2006-04-27 21:58:47 +02:00
Vadim Gelfer
dfe0de6855 add merge command. means same thing as "update -m".
repo.addchangegroup method now returns number of heads modified and added,
so command line can tell whether update or merge needed.  this makes
tiny change to ssh wire protocol, but change is backwards compatible.

pull command now returns 0 if no changes to pull.
2006-03-29 10:27:16 -08:00
Benoit Boissinot
c75c19e929 add an optional argument to push only the specified revisions (push -r) 2006-02-14 21:11:57 +01:00