Mercurial > hg
comparison tests/test-keyword.t @ 21720:db2392a4effc
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 09 Jun 2014 13:53:23 -0500 |
parents | 9c35f3a8cac4 2668a78df8ba |
children | 15baed3f24ee |
comparison
equal
deleted
inserted
replaced
21719:28ecdf3fa1db | 21720:db2392a4effc |
---|---|
1136 ignore $Id$ | 1136 ignore $Id$ |
1137 a | 1137 a |
1138 | 1138 |
1139 Now disable keyword expansion | 1139 Now disable keyword expansion |
1140 | 1140 |
1141 $ cp $HGRCPATH $HGRCPATH.backup | |
1141 $ rm "$HGRCPATH" | 1142 $ rm "$HGRCPATH" |
1142 $ cat a b | 1143 $ cat a b |
1143 expand $Id$ | 1144 expand $Id$ |
1144 do not process $Id: | 1145 do not process $Id: |
1145 xxx $ | 1146 xxx $ |
1151 xxx $ | 1152 xxx $ |
1152 $Xinfo$ | 1153 $Xinfo$ |
1153 ignore $Id$ | 1154 ignore $Id$ |
1154 a | 1155 a |
1155 | 1156 |
1157 enable keyword expansion again | |
1158 | |
1159 $ cat $HGRCPATH.backup >> $HGRCPATH | |
1160 | |
1161 Test restricted mode with unshelve | |
1162 | |
1163 $ cat <<EOF >> $HGRCPATH | |
1164 > [extensions] | |
1165 > shelve = | |
1166 > EOF | |
1167 | |
1168 $ echo xxxx >> a | |
1169 $ hg diff | |
1170 diff -r 800511b3a22d a | |
1171 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1172 +++ b/a * (glob) | |
1173 @@ -2,3 +2,4 @@ | |
1174 do not process $Id: | |
1175 xxx $ | |
1176 $Xinfo$ | |
1177 +xxxx | |
1178 $ hg shelve -q --name tmp | |
1179 $ hg shelve --list --patch | |
1180 tmp (*) changes to 'localresolve' (glob) | |
1181 | |
1182 diff --git a/a b/a | |
1183 --- a/a | |
1184 +++ b/a | |
1185 @@ -2,3 +2,4 @@ | |
1186 do not process $Id: | |
1187 xxx $ | |
1188 $Xinfo$ | |
1189 +xxxx | |
1190 | |
1191 $ hg update -q -C 10 | |
1192 $ hg unshelve -q tmp | |
1193 $ hg diff | |
1194 diff -r 4aa30d025d50 a | |
1195 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1196 +++ b/a * (glob) | |
1197 @@ -3,3 +3,4 @@ | |
1198 do not process $Id: | |
1199 xxx $ | |
1200 $Xinfo$ | |
1201 +xxxx | |
1202 | |
1203 Test restricted mode with rebase | |
1204 | |
1205 $ cat <<EOF >> $HGRCPATH | |
1206 > [extensions] | |
1207 > rebase = | |
1208 > EOF | |
1209 | |
1210 $ hg update -q -C 9 | |
1211 | |
1212 $ echo xxxx >> a | |
1213 $ hg commit -m '#11' | |
1214 $ hg diff -c 11 | |
1215 diff -r 800511b3a22d -r b07670694489 a | |
1216 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1217 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1218 @@ -2,3 +2,4 @@ | |
1219 do not process $Id: | |
1220 xxx $ | |
1221 $Xinfo$ | |
1222 +xxxx | |
1223 | |
1224 $ hg diff -c 10 | |
1225 diff -r 27d48ee14f67 -r 4aa30d025d50 a | |
1226 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1227 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1228 @@ -1,3 +1,4 @@ | |
1229 +foobranch | |
1230 expand $Id$ | |
1231 do not process $Id: | |
1232 xxx $ | |
1233 | |
1234 $ hg rebase -q -s 10 -d 11 --keep | |
1235 $ hg diff -r 9 -r 12 a | |
1236 diff -r 800511b3a22d -r 1939b927726c a | |
1237 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1238 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1239 @@ -1,4 +1,6 @@ | |
1240 +foobranch | |
1241 expand $Id$ | |
1242 do not process $Id: | |
1243 xxx $ | |
1244 $Xinfo$ | |
1245 +xxxx | |
1246 | |
1247 Test restricted mode with graft | |
1248 | |
1249 $ hg graft -q 10 | |
1250 $ hg diff -r 9 -r 13 a | |
1251 diff -r 800511b3a22d -r 01a68de1003a a | |
1252 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1253 +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |
1254 @@ -1,4 +1,6 @@ | |
1255 +foobranch | |
1256 expand $Id$ | |
1257 do not process $Id: | |
1258 xxx $ | |
1259 $Xinfo$ | |
1260 +xxxx | |
1261 | |
1262 Test restricted mode with backout | |
1263 | |
1264 $ hg backout -q 11 | |
1265 $ hg diff a | |
1266 diff -r 01a68de1003a a | |
1267 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1268 +++ b/a * (glob) | |
1269 @@ -3,4 +3,3 @@ | |
1270 do not process $Id: | |
1271 xxx $ | |
1272 $Xinfo$ | |
1273 -xxxx | |
1274 | |
1275 Test restricted mode with histedit | |
1276 | |
1277 $ cat <<EOF >> $HGRCPATH | |
1278 > [extensions] | |
1279 > histedit = | |
1280 > EOF | |
1281 | |
1282 $ hg commit -m 'backout #11' | |
1283 $ hg histedit -q --command - 13 <<EOF | |
1284 > pick 49f5f2d940c3 14 backout #11 | |
1285 > pick 01a68de1003a 13 9foobranch | |
1286 > EOF | |
1287 | |
1288 Test restricted mode with fetch (with merge) | |
1289 | |
1290 $ cat <<EOF >> $HGRCPATH | |
1291 > [extensions] | |
1292 > fetch = | |
1293 > EOF | |
1294 | |
1295 $ hg clone -q -r 9 . ../fetch-merge | |
1296 $ cd ../fetch-merge | |
1297 $ hg -R ../Test export 10 | hg import -q - | |
1298 $ hg fetch -q -r 11 | |
1299 $ hg diff -r 9 a | |
1300 diff -r 800511b3a22d a | |
1301 --- a/a Thu Jan 01 00:00:00 1970 +0000 | |
1302 +++ b/a * (glob) | |
1303 @@ -1,4 +1,6 @@ | |
1304 +foobranch | |
1305 expand $Id$ | |
1306 do not process $Id: | |
1307 xxx $ | |
1308 $Xinfo$ | |
1309 +xxxx | |
1310 | |
1156 $ cd .. | 1311 $ cd .. |