comparison tests/test-fix.t @ 40569:19e1c26213f1

cleanup: use revision numbers instead of hashes in test output This allows changes to the hashes produced by fix to not needlessly modify this area of the test. Differential Revision: https://phab.mercurial-scm.org/D5244
author Danny Hooper <hooper@google.com>
date Thu, 08 Nov 2018 12:29:56 -0800
parents b9557567cc3f
children ad71c792a8d8
comparison
equal deleted inserted replaced
40568:b93157f69f46 40569:19e1c26213f1
891 $ printf "foo\n" > foo.whole 891 $ printf "foo\n" > foo.whole
892 $ hg commit -m "edit foo" 892 $ hg commit -m "edit foo"
893 $ printf "BAR\n" > bar.whole 893 $ printf "BAR\n" > bar.whole
894 $ hg commit -Aqm "add bar" 894 $ hg commit -Aqm "add bar"
895 895
896 $ hg log --graph --template '{node|shortest} {files}' 896 $ hg log --graph --template '{rev} {files}'
897 @ bc05 bar.whole 897 @ 2 bar.whole
898 | 898 |
899 o 4fd2 foo.whole 899 o 1 foo.whole
900 | 900 |
901 o f9ac foo.whole 901 o 0 foo.whole
902 902
903 $ hg fix -r 0:2 903 $ hg fix -r 0:2
904 $ hg log --graph --template '{node|shortest} {files}' 904 $ hg log --graph --template '{rev} {files}'
905 o b4e2 bar.whole 905 o 4 bar.whole
906 | 906 |
907 o 59f4 907 o 3
908 | 908 |
909 | @ bc05 bar.whole 909 | @ 2 bar.whole
910 | | 910 | |
911 | x 4fd2 foo.whole 911 | x 1 foo.whole
912 |/ 912 |/
913 o f9ac foo.whole 913 o 0 foo.whole
914 914
915 915
916 $ cd .. 916 $ cd ..
917 917
918 It's also possible that the child needs absolutely no changes, but we still 918 It's also possible that the child needs absolutely no changes, but we still