comparison tests/test-revert-interactive.t @ 31196:3af9a9628ecf

revert: always display hunks reversed when reverting to parent When reverting to the parent of working directory, operation is "discard" so we want hunks to be presented in the same order as the diff (i.e. "reversed"). So we do not query the experimental.revertalternateinteractivemode option in this case and always set "reversehunks" to True.
author Denis Laxalde <denis.laxalde@logilab.fr>
date Mon, 06 Mar 2017 14:11:21 +0100
parents 66b162fa3ffa
children 51fdedd29b0a
comparison
equal deleted inserted replaced
31195:6b098ac4542e 31196:3af9a9628ecf
378 reverting folder1/g (glob) 378 reverting folder1/g (glob)
379 diff --git a/folder1/g b/folder1/g 379 diff --git a/folder1/g b/folder1/g
380 3 hunks, 3 lines changed 380 3 hunks, 3 lines changed
381 examine changes to 'folder1/g'? [Ynesfdaq?] y 381 examine changes to 'folder1/g'? [Ynesfdaq?] y
382 382
383 @@ -1,5 +1,4 @@ 383 @@ -1,4 +1,5 @@
384 -firstline 384 +firstline
385 c 385 c
386 1 386 1
387 2 387 2
388 3 388 3
389 discard change 1/3 to 'folder1/g'? [Ynesfdaq?] y 389 discard change 1/3 to 'folder1/g'? [Ynesfdaq?] y
390 390
391 @@ -2,7 +1,7 @@ 391 @@ -1,7 +2,7 @@
392 c 392 c
393 1 393 1
394 2 394 2
395 3 395 3
396 - 3 396 -4
397 +4 397 + 3
398 5 398 5
399 d 399 d
400 discard change 2/3 to 'folder1/g'? [Ynesfdaq?] y 400 discard change 2/3 to 'folder1/g'? [Ynesfdaq?] y
401 401
402 @@ -7,3 +6,2 @@ 402 @@ -6,2 +7,3 @@
403 5 403 5
404 d 404 d
405 -lastline 405 +lastline
406 discard change 3/3 to 'folder1/g'? [Ynesfdaq?] n 406 discard change 3/3 to 'folder1/g'? [Ynesfdaq?] n
407 407
408 $ hg diff --nodates 408 $ hg diff --nodates
409 diff -r a3d963a027aa folder1/g 409 diff -r a3d963a027aa folder1/g
410 --- a/folder1/g 410 --- a/folder1/g