##// 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.
Martin Geisler - - Load All Authors

File last commit:

r20117:aa9385f9 default
r22287:f3ac9677 default
Show More
bzr-definitions
18 lines | 361 B | text/plain | TextLexer
/ tests / bzr-definitions
History | Source | Raw |Copy content |Copy permalink
Marek Kubica
convert: add bzr source
 r7053 # this file holds the definitions that are used in various bzr tests
"$TESTDIR/hghave" bzr || exit 80
Brodie Rao
tests: remove more instances of export FOO=bar bashism
 r9042 TERM=dumb; export TERM
Marek Kubica
convert: add bzr source
 r7053 echo '[extensions]' >> $HGRCPATH
echo 'convert = ' >> $HGRCPATH
glog()
{
Martin Geisler
tests: don't load unnecessary graphlog extension...
 r20117 hg log -G --template '{rev}@{branch} "{desc|firstline}" files: {files}\n' "$@"
Marek Kubica
convert: add bzr source
 r7053 }
manifest()
{
echo "% manifest of $2"
hg -R $1 manifest -v -r $2
}