Mercurial > hg > mercurial-source
view tests/notcapable @ 16255:ca5cc2976574 stable
merge: handle linear update to symlink correctly (issue3316)
This fixes a regression introduced by fcf66193b186. If no file-level
merge is needed, we can update flags directly, otherwise we have a
conflict to resolve in filemerge.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 13 Mar 2012 16:28:08 -0500 |
parents | 9ff996ba00b4 |
children | 1ac628cd7113 |
line wrap: on
line source
# Disable the $CAP wire protocol capability. if test -z "$CAP" then echo "CAP environment variable not set." fi cat > notcapable-$CAP.py << EOF from mercurial import extensions, repo def extsetup(): extensions.wrapfunction(repo.repository, 'capable', wrapper) def wrapper(orig, self, name, *args, **kwargs): if name in '$CAP'.split(' '): return False return orig(self, name, *args, **kwargs) EOF echo '[extensions]' >> $HGRCPATH echo "notcapable-$CAP = `pwd`/notcapable-$CAP.py" >> $HGRCPATH