##// END OF EJS Templates
keyword: suppress keyword expansion while 'hg fetch' for internal merge...
FUJIWARA Katsunori -
r21708:2668a78d 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 backout histedit')
106 ' unshelve rebase graft backout histedit fetch')
107 107
108 108 # names of extensions using dorecord
109 109 recordextensions = 'record'
@@ -1284,4 +1284,27 b' Test restricted mode with histedit'
1284 1284 > pick 01a68de1003a 13 9foobranch
1285 1285 > EOF
1286 1286
1287 Test restricted mode with fetch (with merge)
1288
1289 $ cat <<EOF >> $HGRCPATH
1290 > [extensions]
1291 > fetch =
1292 > EOF
1293
1294 $ hg clone -q -r 9 . ../fetch-merge
1295 $ cd ../fetch-merge
1296 $ hg -R ../Test export 10 | hg import -q -
1297 $ hg fetch -q -r 11
1298 $ hg diff -r 9 a
1299 diff -r 800511b3a22d a
1300 --- a/a Thu Jan 01 00:00:00 1970 +0000
1301 +++ b/a * (glob)
1302 @@ -1,4 +1,6 @@
1303 +foobranch
1304 expand $Id$
1305 do not process $Id:
1306 xxx $
1307 $Xinfo$
1308 +xxxx
1309
1287 1310 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now