##// END OF EJS Templates
keyword: suppress keyword expansion while 'hg rebase' for internal merge...
FUJIWARA Katsunori -
r21704:65dd65c6 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')
106 ' unshelve rebase')
107 107
108 108 # names of extensions using dorecord
109 109 recordextensions = 'record'
@@ -1199,4 +1199,48 b' Test restricted mode with unshelve'
1199 1199 $Xinfo$
1200 1200 +xxxx
1201 1201
1202 Test restricted mode with rebase
1203
1204 $ cat <<EOF >> $HGRCPATH
1205 > [extensions]
1206 > rebase =
1207 > EOF
1208
1209 $ hg update -q -C 9
1210
1211 $ echo xxxx >> a
1212 $ hg commit -m '#11'
1213 $ hg diff -c 11
1214 diff -r 800511b3a22d -r b07670694489 a
1215 --- a/a Thu Jan 01 00:00:00 1970 +0000
1216 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1217 @@ -2,3 +2,4 @@
1218 do not process $Id:
1219 xxx $
1220 $Xinfo$
1221 +xxxx
1222
1223 $ hg diff -c 10
1224 diff -r 27d48ee14f67 -r 4aa30d025d50 a
1225 --- a/a Thu Jan 01 00:00:00 1970 +0000
1226 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1227 @@ -1,3 +1,4 @@
1228 +foobranch
1229 expand $Id$
1230 do not process $Id:
1231 xxx $
1232
1233 $ hg rebase -q -s 10 -d 11 --keep
1234 $ hg diff -r 9 -r 12 a
1235 diff -r 800511b3a22d -r 1939b927726c a
1236 --- a/a Thu Jan 01 00:00:00 1970 +0000
1237 +++ b/a Thu Jan 01 00:00:00 1970 +0000
1238 @@ -1,4 +1,6 @@
1239 +foobranch
1240 expand $Id$
1241 do not process $Id:
1242 xxx $
1243 $Xinfo$
1244 +xxxx
1245
1202 1246 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now