##// END OF EJS Templates
keyword: suppress keyword expansion while 'hg backout' for internal merge...
FUJIWARA Katsunori -
r21706:5c64c338 stable
parent child Browse files
Show More
@@ -103,7 +103,7 b" nokwcommands = ('add addremove annotate "
103 103 # hg commands that trigger expansion only when writing to working dir,
104 104 # not when reading filelog, and unexpand when reading from working dir
105 105 restricted = ('merge kwexpand kwshrink record qrecord resolve transplant'
106 ' unshelve rebase graft')
106 ' unshelve rebase graft backout')
107 107
108 108 # names of extensions using dorecord
109 109 recordextensions = 'record'
@@ -1258,4 +1258,17 b' Test restricted mode with graft'
1258 1258 $Xinfo$
1259 1259 +xxxx
1260 1260
1261 Test restricted mode with backout
1262
1263 $ hg backout -q 11
1264 $ hg diff a
1265 diff -r 01a68de1003a a
1266 --- a/a Thu Jan 01 00:00:00 1970 +0000
1267 +++ b/a * (glob)
1268 @@ -3,4 +3,3 @@
1269 do not process $Id:
1270 xxx $
1271 $Xinfo$
1272 -xxxx
1273
1261 1274 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now