comparison setup.py @ 21705:dd5ca1a32109 stable

keyword: suppress keyword expansion while 'hg graft' for internal merge Before this patch, 'hg graft' may cause unexpected conflict, if 'hg graft'-ed changes are located near lines in which keywords are embedded, because keywords are substituted with other strings in the working directory. This patch suppresses keyword expansion while 'hg graft' for internal merge by adding 'graft' to 'restricted' command list like 'merge'.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Thu, 05 Jun 2014 16:47:14 +0900
parents 54d7657d7d1e
children 8b482d49563b f266be73f764
comparison
equal deleted inserted replaced
21704:65dd65c645ed 21705:dd5ca1a32109