##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

clone: print "updating working directory" status message...
clone: print "updating working directory" status message With this change, "hg clone" looks like this: % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved So the user sees % hg clone http://example.com/repo/big big requesting all changes adding changesets adding manifests adding file changes added XXX changesets with XXX changes to XXX files updating working directory while Mercurial is writing to disk to populate the working directory With this change, "hg clone" looks like this: % hg clone big big-work updating working directory XXX files updated, XXX files merged, XXX files removed, XXX files unresolved
Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default
r6338:0750f111 default
Show More
test-conflict.out
17 lines | 415 B | text/plain | TextLexer
/ tests / test-conflict.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
merge: allow smarter tool configuration...
 r6004 merging a
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 warning: conflicts during merge.
mpm@selenic.com
merge3: fix argument order...
 r346 merging a failed!
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 2
hg merge 1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 e7fe8eb3e180+0d24b7662d3e+ tip
Matt Mackall
merge: allow smarter tool configuration...
 r6004 <<<<<<< local
mpm@selenic.com
merge3: fix argument order...
 r346 something else
=======
something
Alexis S. L. Carvalho
run-tests.py: pass -L/--label to simplemerge...
 r4387 >>>>>>> other
mpm@selenic.com
Update test output for status change...
 r748 M a
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? a.orig