##// END OF EJS Templates
rebase: while rewriting desc hashes, ignore ambiguous prefix "hashes"...
Kyle Lippincott -
r49941:532b649c stable
parent child Browse files
Show More
@@ -215,9 +215,9 b' def update_hash_refs(repo, commitmsg, pe'
215 for h in hashes:
215 for h in hashes:
216 try:
216 try:
217 fullnode = scmutil.resolvehexnodeidprefix(unfi, h)
217 fullnode = scmutil.resolvehexnodeidprefix(unfi, h)
218 except error.WdirUnsupported:
218 except (error.WdirUnsupported, error.AmbiguousPrefixLookupError):
219 # Someone has an fffff... in a commit message we're
219 # Someone has an fffff... or some other prefix that's ambiguous in a
220 # rewriting. Don't try rewriting that.
220 # commit message we're rewriting. Don't try rewriting that.
221 continue
221 continue
222 if fullnode is None:
222 if fullnode is None:
223 continue
223 continue
@@ -1027,8 +1027,7 b' scheme ever changes:'
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
General Comments 0
You need to be logged in to leave comments. Login now