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

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

localrepo: introduce method for explicit branch cache update...
localrepo: introduce method for explicit branch cache update Currently, localrepo.branchtags() is called in two locations to update the _branchcache dict, however branchtags() itself does not update anything, it calls branchmap() to do so. This change introduces a new updatebranchcache() method that is used by both branchmap() and the calls to update the cache.
Matt Mackall - - Load All Authors

File last commit:

r6518:92ccccb5 default
r12066:d01e2865 default
Show More
test-merge-revert2.out
38 lines | 909 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
use 'hg resolve' to retry unresolved file merges
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