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

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

prepush: add more precise error messages...
prepush: add more precise error messages Part of the patch is from timeless@mozdev.org - indicate the branch name where there are multiple heads - give better advice when hitting a possible race, where new heads are added between discovery and the call to branchmap(). In that case, asking the user to merge isn't helpful, since only remote has the changes.
Matt Mackall - - Load All Authors

File last commit:

r10282:08a0f04b default
r10396:65a90c8e default
Show More
test-mq-git
79 lines | 1.6 KiB | text/plain | TextLexer
/ tests / test-mq-git
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# Test the plumbing of mq.git option
# Automatic upgrade itself is tested elsewhere.
echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH
echo "[diff]" >> $HGRCPATH
echo "nodates=1" >> $HGRCPATH
hg init repo-auto
cd repo-auto
echo '% git=auto: regular patch creation'
echo a > a
hg add a
hg qnew -d '0 0' -f adda
cat .hg/patches/adda
echo '% git=auto: git patch creation with copy'
hg cp a b
hg qnew -d '0 0' -f copy
cat .hg/patches/copy
echo '% git=auto: git patch when using --git'
echo regular > regular
hg add regular
hg qnew -d '0 0' --git -f git
cat .hg/patches/git
echo '% git=auto: regular patch after qrefresh without --git'
hg qrefresh -d '0 0'
cat .hg/patches/git
cd ..
hg init repo-keep
cd repo-keep
echo '[mq]' > .hg/hgrc
echo 'git = KEEP' >> .hg/hgrc
echo '% git=keep: git patch with --git'
echo a > a
hg add a
hg qnew -d '0 0' -f --git git
cat .hg/patches/git
echo '% git=keep: git patch after qrefresh without --git'
echo a >> a
hg qrefresh -d '0 0'
cat .hg/patches/git
cd ..
hg init repo-yes
cd repo-yes
echo '[mq]' > .hg/hgrc
echo 'git = yes' >> .hg/hgrc
echo '% git=yes: git patch'
echo a > a
hg add a
hg qnew -d '0 0' -f git
cat .hg/patches/git
echo '% git=yes: git patch after qrefresh'
echo a >> a
hg qrefresh -d '0 0'
cat .hg/patches/git
cd ..
hg init repo-no
cd repo-no
echo '[diff]' > .hg/hgrc
echo 'git = True' >> .hg/hgrc
echo '[mq]' > .hg/hgrc
echo 'git = False' >> .hg/hgrc
echo '% git=no: regular patch with copy'
echo a > a
hg add a
hg qnew -d '0 0' -f adda
hg cp a b
hg qnew -d '0 0' -f regular
cat .hg/patches/regular
echo '% git=no: regular patch after qrefresh with copy'
hg cp a c
hg qrefresh -d '0 0'
cat .hg/patches/regular
cd ..