Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2026-02-16 01:36:44 +01:00
Code Issues Packages Projects Releases Activity

Fix "Branch ... modified outside hg-fast-export..." for sanitized branch names

Browse Source 
The heads cache contains sanitized names, but we try to look up
unsanitized names, this is wrong. Switch to looking up the sanitized
name.
This commit is contained in:
Frej Drejhammar
2016-04-15 15:46:47 +02:00
parent f8792d9c5c
commit c614ae776b
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hg-fast-export.py
View File

@@ -337,8 +337,9 @@ def verify_heads(ui,repo,cache,force,branchesmap):
# get list of hg's branches to verify, don't take all git has
for _,_,b in l:
b=get_branch(b)
sha1=get_git_sha1(sanitize_name(b,"branch",branchesmap))
c=cache.get(b)
sanitized_name=sanitize_name(b,"branch",branchesmap)
sha1=get_git_sha1(sanitized_name)
c=cache.get(sanitized_name)
if sha1!=c:
sys.stderr.write('Error: Branch [%s] modified outside hg-fast-export:'
'\n%s (repo) != %s (cache)\n' % (b,sha1,c))