##// 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.
Thomas Arendsen Hein - - Load All Authors

File last commit:

r4659:7a7d4937 default
r12066:d01e2865 default
Show More
test-empty-file
25 lines | 422 B | text/plain | TextLexer
/ tests / test-empty-file
History | Source | Raw |Copy content |Copy permalink
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
 r3509 #!/bin/sh
hg init a
cd a
touch empty1
hg add empty1
hg commit -m 'add empty1' -d '1000000 0'
touch empty2
hg add empty2
hg commit -m 'add empty2' -d '1000000 0'
hg up -C 0
touch empty3
hg add empty3
hg commit -m 'add empty3' -d '1000000 0'
hg heads
hg merge 1
Thomas Arendsen Hein
Kill trailing spaces
 r4659 # before changeset 05257fd28591, we didn't notice the
Alexis S. L. Carvalho
Test that we notice the empty files from the second parent during a merge...
 r3509 # empty file that came from rev 1.
hg status
hg commit -m merge -d '1000000 0'
Matt Mackall
make manifest friendlier...
 r3736 hg manifest --debug tip