facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 16:57:49 +03:00
Code Issues Projects Releases Wiki Activity
5,894 Commits 24 Branches 62 Tags 324 MiB
d600347898
Commit Graph

4 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
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
mpm@selenic.com
2f510bb7be clone: fall back to pull if we can't lock the source repo 2005-09-14 15:48:34 -05:00