Mercurial > hg

comparison tests/test-commit-interactive.t @ 42585:ebf353aa4385

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update test-commit-interactive.t for no-execbit platforms These changes correspond with f802a75da585. Differential Revision: https://phab.mercurial-scm.org/D6624
author Matt Harbison <matt_harbison@yahoo.com>
date Tue, 09 Jul 2019 20:51:48 -0400
parents f802a75da585
children 8d72e29ad1e0
comparison
equal deleted inserted replaced
42584:db5560c07a28 42585:ebf353aa4385
1214 > y 1214 > y
1215 > y 1215 > y
1216 > EOF 1216 > EOF
1217 diff --git a/subdir/f1 b/subdir/f1 1217 diff --git a/subdir/f1 b/subdir/f1
1218 1 hunks, 1 lines changed 1218 1 hunks, 1 lines changed
1219 examine changes to 'subdir/f1'? [Ynesfdaq?] y 1219 examine changes to 'subdir/f1'?
1220 (enter ? for help) [Ynesfdaq?] y
1220 1221
1221 @@ -1,2 +1,3 @@ 1222 @@ -1,2 +1,3 @@
1222 a 1223 a
1223 a 1224 a
1224 +a 1225 +a
1225 record this change to 'subdir/f1'? [Ynesfdaq?] y 1226 record this change to 'subdir/f1'?
1227 (enter ? for help) [Ynesfdaq?] y
1226 1228
1227 1229
1228 $ hg tip --config diff.git=True -p 1230 $ hg tip --config diff.git=True -p
1229 changeset: 24:c26cfe2c4eb0 1231 changeset: 24:c26cfe2c4eb0
1230 tag: tip 1232 tag: tip
1249 > y 1251 > y
1250 > y 1252 > y
1251 > EOF 1253 > EOF
1252 diff --git a/subdir/f1 b/subdir/f1 1254 diff --git a/subdir/f1 b/subdir/f1
1253 1 hunks, 1 lines changed 1255 1 hunks, 1 lines changed
1254 examine changes to 'subdir/f1'? [Ynesfdaq?] y 1256 examine changes to 'subdir/f1'?
1257 (enter ? for help) [Ynesfdaq?] y
1255 1258
1256 @@ -1,3 +1,4 @@ 1259 @@ -1,3 +1,4 @@
1257 a 1260 a
1258 a 1261 a
1259 a 1262 a
1260 +b 1263 +b
1261 record this change to 'subdir/f1'? [Ynesfdaq?] y 1264 record this change to 'subdir/f1'?
1265 (enter ? for help) [Ynesfdaq?] y
1262 1266
1263 1267
1264 $ hg tip --config diff.git=True -p 1268 $ hg tip --config diff.git=True -p
1265 changeset: 25:a48d2d60adde 1269 changeset: 25:a48d2d60adde
1266 tag: tip 1270 tag: tip
1287 > y 1291 > y
1288 > y 1292 > y
1289 > EOF 1293 > EOF
1290 diff --git a/subdir/f1 b/subdir/f1 1294 diff --git a/subdir/f1 b/subdir/f1
1291 1 hunks, 1 lines changed 1295 1 hunks, 1 lines changed
1292 examine changes to 'subdir/f1'? [Ynesfdaq?] y 1296 examine changes to 'subdir/f1'?
1297 (enter ? for help) [Ynesfdaq?] y
1293 1298
1294 @@ -2,3 +2,4 @@ a 1299 @@ -2,3 +2,4 @@ a
1295 a 1300 a
1296 a 1301 a
1297 b 1302 b
1298 +c 1303 +c
1299 record this change to 'subdir/f1'? [Ynesfdaq?] y 1304 record this change to 'subdir/f1'?
1305 (enter ? for help) [Ynesfdaq?] y
1300 1306
1301 1307
1302 $ hg tip --config diff.git=True -p 1308 $ hg tip --config diff.git=True -p
1303 changeset: 26:5cc89ae210fa 1309 changeset: 26:5cc89ae210fa
1304 tag: tip 1310 tag: tip