Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 47787:48da5c325750 stable
rewriteutil: fix crash when a rewritten message references f{6,64}
Without this, the rewriteutil logic thinks it's found a reference to the wdir
pseudo-revision, and then tries to look it up and rewrite it. Stop it from
doing that.
Amusingly, I had trouble working with this changeset when I didn't
describe the defect above using a regular expression, because it would
trigger the bug in my installed version of hg.
Differential Revision: https://phab.mercurial-scm.org/D11232
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 29 Jul 2021 16:23:45 -0400 |
parents | 324c8a299324 |
children | 80579e597439 |
comparison
equal
deleted
inserted
replaced
47786:324c8a299324 | 47787:48da5c325750 |
---|---|
969 $ echo update_hash_refs > update_hash_refs | 969 $ echo update_hash_refs > update_hash_refs |
970 $ hg add update_hash_refs | 970 $ hg add update_hash_refs |
971 $ hg ci -m 'this will change hash' | 971 $ hg ci -m 'this will change hash' |
972 created new head | 972 created new head |
973 $ echo changed >> update_hash_refs | 973 $ echo changed >> update_hash_refs |
974 $ hg ci -m "this starts as the child of `hg log -r . -T'{node|short}'` but not 506e2454484b" | 974 $ hg ci -m "this starts as the child of `hg log -r . -T'{node|short}'` but not 506e2454484b. Also, ffffffffffffffff" |
975 $ hg tglog | 975 $ hg tglog |
976 @ 5: becd28036887 'this starts as the child of 98789aa60148 but not 506e2454484b' | 976 @ 5: a8b42cbbde83 'this starts as the child of 98789aa60148 but not 506e2454484b. Also, ffffffffffffffff' |
977 | | 977 | |
978 o 4: 98789aa60148 'this will change hash' | 978 o 4: 98789aa60148 'this will change hash' |
979 | | 979 | |
980 | o 3: 506e2454484b 'merge' | 980 | o 3: 506e2454484b 'merge' |
981 | |\ | 981 | |\ |
985 |/ | 985 |/ |
986 o 0: d20a80d4def3 'base' | 986 o 0: d20a80d4def3 'base' |
987 | 987 |
988 $ hg rebase -r '.^::' -d 3 | 988 $ hg rebase -r '.^::' -d 3 |
989 rebasing 4:98789aa60148 "this will change hash" | 989 rebasing 4:98789aa60148 "this will change hash" |
990 rebasing 5:becd28036887 tip "this starts as the child of 98789aa60148 but not 506e2454484b" | 990 rebasing 5:a8b42cbbde83 tip "this starts as the child of 98789aa60148 but not 506e2454484b. Also, ffffffffffffffff" |
991 saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/98789aa60148-72ec40bd-rebase.hg | 991 saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/98789aa60148-da3f4c2c-rebase.hg |
992 $ hg tglog | 992 $ hg tglog |
993 @ 5: a445b8426f4b 'this starts as the child of c16c25696fe7 but not 506e2454484b' | 993 @ 5: 0fd2912e6cc1 'this starts as the child of c16c25696fe7 but not 506e2454484b. Also, ffffffffffffffff' |
994 | | 994 | |
995 o 4: c16c25696fe7 'this will change hash' | 995 o 4: c16c25696fe7 'this will change hash' |
996 | | 996 | |
997 o 3: 506e2454484b 'merge' | 997 o 3: 506e2454484b 'merge' |
998 |\ | 998 |\ |