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

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

Add a features list to branches.cache to detect caches of old hg versions....
Add a features list to branches.cache to detect caches of old hg versions. The leading space in the written file makes sure that the feature list never can match an existing version, even if the first feature can be read as hex. Additionally old hg versions display the id with --debug, too.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default
r4168:bbfe5a3f default
Show More
test-merge6.out
25 lines | 981 B | text/plain | TextLexer
/ tests / test-merge6.out
History | Annotation | Raw |Copy content |Copy permalink
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
pulling from ../B1
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
pulling from ../A2
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 0 changes to 0 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bar should remain deleted.
f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo