##// 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.
Benoit Boissinot - - Load All Authors

File last commit:

r11843:00f8e783 stable
r12066:d01e2865 default
Show More
test-rebase-mq-skip.out
57 lines | 1.0 KiB | text/plain | TextLexer
/ tests / test-rebase-mq-skip.out
History | Annotation | Raw |Copy content |Copy permalink
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
% "Mainstream" import p1.patch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
applying p1.patch
% Rebase
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to
@ 3 P0 tags: p0.patch qbase qtip tip
|
o 2 P1 tags: qparent
|
o 1 R1 tags:
|
o 0 C1 tags:
% Now with --continue
adding r0
adding r1
adding r2
adding r3
adding r4
adding r5
adding r6
0 files updated, 0 files merged, 6 files removed, 0 files unresolved
adding r1
created new head
adding r3
adding r7
adding r8
adding r4
adding r6
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
saved backup bundle to
@ 9 r5 tags: 5.diff qtip tip
|
o 8 r4 tags: 4.diff
|
o 7 r2 tags: 2.diff qbase
|
o 6 branch2-r6 tags: qparent
|
o 5 branch2-r4 tags:
|
o 4 branch2-r8 tags:
|
o 3 branch2-r7 tags:
|
o 2 branch2-r3 tags:
|
o 1 branch2-r1 tags:
|
o 0 r0 tags: