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

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

largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper...
largefiles: move "updatestandin" invocation to "hg.updaterepo" wrapper Code paths below expect "hg.updaterepo" (or "hg.update" using it) to execute linear merging: - "update" in commands - "postincoming" in commands, used for: - "hg pull --update" - "hg unbundle --update" - "hgsubrepo.get" in subrepo For linear merging with largefiles, standins should be updated according to (possibly dirty) largefiles before "merge.update" invocation to detect conflicts correctly. Before this patch, only the "update" command can execute linear merging correctly, because largefiles extension takes care of only it. This patch moves "updatestandin" invocation from "overrideupdate" ("hg update" wrapper) to "_hgupdaterepo" ("hg.updaterepo" wrapper) to execute linear merging in "hg.updaterepo" correctly. This is also a preparation to centralize the logic of updating largefiles in the working directory into the function wrapping "merge.update" in the subsequent patch.
Siddharth Agarwal - - Load All Authors

File last commit:

r18081:f88c60e7 default
r22287:f3ac9677 default
Show More
test-revlog-ancestry.py.out
19 lines | 298 B | text/plain | TextLexer
/ tests / test-revlog-ancestry.py.out
History | Source | Raw |Copy content |Copy permalink
Stefano Tortarolo
Add ancestors and descendants to revlog...
 r6872 Ancestors of 5
4 2 0
Ancestors of 6 and 5
3 4 2 1 0
Ancestors of 5 and 4
4 2 0
Joshua Redstone
revlog: add optional stoprev arg to revlog.ancestors()...
 r16868 Ancestors of 7, stop at 6
6
Siddharth Agarwal
revlog.ancestors: add support for including revs...
 r18081 Ancestors of 7, including revs
7 6 5 3 4 2 1 0
Ancestors of 7, 5 and 3, including revs
7 5 3 6 4 2 1 0
Stefano Tortarolo
Add ancestors and descendants to revlog...
 r6872
Descendants of 5
7 8
Descendants of 5 and 3
6 7 8
Descendants of 5 and 4
5 7 8