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

Merge branch 'PR/197'

Browse Source 
Closes #197, #185, #196
This commit is contained in:
Frej Drejhammar
2020-02-09 19:37:42 +01:00
parent 29a457eccf 0b6b83c3de
commit b5f8d5ecb3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hg-fast-export.py
View File

@@ -323,8 +323,8 @@ def export_commit(ui,repo,revision,old_marks,max,count,authors,
# later non-merge revision: feed in changed manifest
# if we have exactly one parent, just take the changes from the
# manifest without expensively comparing checksums
f=repo.status(parents[0],revnode)[:3]
added,changed,removed=f[1],f[0],f[2]
f=repo.status(parents[0],revnode)
added,changed,removed=f.added,f.modified,f.removed
type='simple delta'
else: # a merge with two parents
wr('merge %s' % revnum_to_revref(parents[1], old_marks))