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

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

mq: Fix --qrefresh --short to work with --exclude and --include...
mq: Fix --qrefresh --short to work with --exclude and --include pmezard expects hg qref -s -X b to apply the -X to the list of files in the patch, and thus remove b from the patch. That's how it worked before f7fc5f5ecd62. That change seemed sensible, but it wasn't... mpm says (17:22:30) pmezard_: kiilerix1: do you mean that -X should be forbidden with -s ? (17:22:54) pmezard_: kiilerix1: and --include too (17:23:03) mpm: No because you should be able to say hg qref -s foo* -X foo-bar so mpm expects hg qref -s -X b * to apply the -X to the list of files in the working directory, and thus don't include b in the patch This patch tries to make both usecases work by creating a matchfn which uses the include/excludes but not the filelist.
Frank Kingswood - - Load All Authors

File last commit:

r6690:127e8c34 default
r7177:09ed32b7 default
Show More
test-convert-cvs-branch
60 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-convert-cvs-branch
History | Annotation | Raw |Copy content |Copy permalink
#!/bin/sh
# This is http://www.selenic.com/mercurial/bts/issue1148
"$TESTDIR/hghave" cvs || exit 80
cvscall()
{
cvs -f "$@"
}
echo "[extensions]" >> $HGRCPATH
echo "convert = " >> $HGRCPATH
echo "graphlog = " >> $HGRCPATH
echo "[convert]" >> $HGRCPATH
echo "cvsps=builtin" >> $HGRCPATH
echo % create cvs repository
mkdir cvsrepo
cd cvsrepo
export CVSROOT=`pwd`
export CVS_OPTIONS=-f
cd ..
cvscall -q -d "$CVSROOT" init
echo % Create a new project
mkdir src
cd src
echo "1" > a > b
cvscall import -m "init" src v0 r0
cd ..
cvscall co src
cd src
echo % Branch the project
cvscall tag -b BRANCH
cvscall up -r BRANCH
echo % Modify file a, then b, then a
echo "2" > a
cvscall ci -m "mod a" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
echo "2" > b
cvscall ci -m "mod b" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
echo "3" > a
cvscall ci -m "mod a again" | grep '<--' | sed -e 's:.*src/\(.*\),v.*:checking in src/\1,v:g'
echo % Convert
cd ..
hg convert src | sed -e 's/connecting to.*cvsrepo/connecting to cvsrepo/g'
echo % Check the result
hg -R src-hg glog --template '#rev# (#branches#) #desc# files: #files#\n'