Mercurial > hg-stable
changeset 48838:80579e597439 stable
tests: add test demonstrating issue with ambiguous has prefixes during rebase
Differential Revision: https://phab.mercurial-scm.org/D12551
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Wed, 13 Apr 2022 13:15:33 -0700 |
| parents | 8653a2a33736 |
| children | 532b649c1deb |
| files | tests/test-rebase-inmemory.t |
| diffstat | 1 files changed, 27 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-rebase-inmemory.t Thu Apr 07 15:53:48 2022 +0200 +++ b/tests/test-rebase-inmemory.t Wed Apr 13 13:15:33 2022 -0700 @@ -1003,6 +1003,33 @@ o 0: d20a80d4def3 'base' +Add an explicit test for rewrite_hash_refs when the detected prefix is +ambiguous. Here's the super low-tech way I found this collision, if the hashing +scheme ever changes: +# hg init +# echo test0 > test +# hg ci -qAm 'test0' -u 'test' -d '0 0' +# i=1 +# while [[ $(chg log -r . -T'{shortest(node, 6)}' | wc -c) -eq 6 ]]; do +# chg co -r 0000000000 +# echo "test$i" > test +# chg ci -qAm "test$i" -u test -d '0 0' +# (( ++i )) +# done + $ hg co -q 0000000000 + $ echo test5281 > test + $ hg ci -qAm 'test5281' + $ hg co -q 000000000 + $ echo test9912 > test + $ hg ci -qAm 'test9912' + $ hg co -q 4 + $ echo contents > some_file + $ hg ci -qAm 'The previous two (parentless) commits had a hash prefix of b04363. Check that rewrite_hash_refs will not fail because of that.' + $ hg rebase -r . -d 5 + rebasing 8:5c4cdabf5769 tip "The previous two (parentless) commits had a hash prefix of b04363. Check that rewrite_hash_refs will not fail because of that." + abort: 00changelog@b04363: ambiguous identifier (known-bad-output !) + [50] + $ cd .. Test (virtual) working directory without changes, created by merge conflict