Mercurial > public > mercurial-scm > hg-stable
diff tests/test-keyword.t @ 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 | 65dd65c645ed |
| children | 5c64c338fa9f |
line wrap: on
line diff
--- a/tests/test-keyword.t Thu Jun 05 16:47:13 2014 +0900 +++ b/tests/test-keyword.t Thu Jun 05 16:47:14 2014 +0900 @@ -1243,4 +1243,19 @@ $Xinfo$ +xxxx +Test restricted mode with graft + + $ hg graft -q 10 + $ hg diff -r 9 -r 13 a + diff -r 800511b3a22d -r 01a68de1003a a + --- a/a Thu Jan 01 00:00:00 1970 +0000 + +++ b/a Thu Jan 01 00:00:00 1970 +0000 + @@ -1,4 +1,6 @@ + +foobranch + expand $Id$ + do not process $Id: + xxx $ + $Xinfo$ + +xxxx + $ cd ..