##// 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
Matt Mackall - - Load All Authors

File last commit:

r6004:5af5f0f9 default
r6338:0750f111 default
Show More
test-merge-revert2.out
41 lines | 980 B | text/plain | TextLexer
/ tests / test-merge-revert2.out
History | Annotation | Raw |Copy content |Copy permalink
1:f248da0d4c3e
0:9eca13a34789
f248da0d4c3e tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
9eca13a34789
9eca13a34789+
reverting file1
9eca13a34789
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f248da0d4c3e tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file1
warning: conflicts during merge.
merging file1 failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges with locally modified files.
You can redo the full merge using:
hg update 0
hg update 1
diff -r f248da0d4c3e file1
--- a/file1
+++ b/file1
@@ -1,3 +1,7 @@
added file1
another line of text
+<<<<<<< local
+changed file1 different
+=======
changed file1
+>>>>>>> other
M file1
? file1.orig
f248da0d4c3e+ tip
reverting file1
? file1.orig
f248da0d4c3e tip
? file1.orig
f248da0d4c3e tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
f248da0d4c3e tip