Mercurial > hg
comparison tests/test-rebase-inmemory.t @ 49060:532b649c1deb stable
rebase: while rewriting desc hashes, ignore ambiguous prefix "hashes"
If a repo is sufficiently large, a six digit number "hash prefix" can somewhat
easily reference an ambiguous hash prefix.
Differential Revision: https://phab.mercurial-scm.org/D12552
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Wed, 13 Apr 2022 12:14:17 -0700 |
| parents | 80579e597439 |
| children |
comparison
equal
deleted
inserted
replaced
| 49059:80579e597439 | 49060:532b649c1deb |
|---|---|
| 1025 $ hg co -q 4 | 1025 $ hg co -q 4 |
| 1026 $ echo contents > some_file | 1026 $ echo contents > some_file |
| 1027 $ 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.' | 1027 $ 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.' |
| 1028 $ hg rebase -r . -d 5 | 1028 $ hg rebase -r . -d 5 |
| 1029 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." | 1029 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." |
| 1030 abort: 00changelog@b04363: ambiguous identifier (known-bad-output !) | 1030 saved backup bundle to $TESTTMP/keep_merge/.hg/strip-backup/5c4cdabf5769-335e1828-rebase.hg |
| 1031 [50] | |
| 1032 | 1031 |
| 1033 $ cd .. | 1032 $ cd .. |
| 1034 | 1033 |
| 1035 Test (virtual) working directory without changes, created by merge conflict | 1034 Test (virtual) working directory without changes, created by merge conflict |
| 1036 resolution. There was a regression where the file was incorrectly detected as | 1035 resolution. There was a regression where the file was incorrectly detected as |