Mercurial > hg
view tests/test-patch @ 10672:c2e1e637d4da stable
rebase: always check if rebasing onto an applied mq patch.
Previously, it only checked for an mq patch if the user explicitly
passed -d/--dest. But rebasing onto an mq patch is a bad idea
regardless of how we determine the rebase destination.
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 02 Mar 2010 15:08:43 -0500 |
parents | 0de7e6e27fe4 |
children |
line wrap: on
line source
#!/bin/sh cat > patchtool.py <<EOF import sys print 'Using custom patch' if '--binary' in sys.argv: print '--binary found !' EOF echo "[ui]" >> $HGRCPATH echo "patch=python ../patchtool.py" >> $HGRCPATH hg init a cd a echo a > a hg commit -Ama -d '1 0' echo b >> a hg commit -Amb -d '2 0' cd .. # This test check that: # - custom patch commands with arguments actually works # - patch code does not try to add weird arguments like # --binary when custom patch commands are used. For instance # --binary is added by default under win32. echo % check custom patch options are honored hg --cwd a export -o ../a.diff tip hg clone -r 0 a b hg --cwd b import -v ../a.diff