Skip to content

Commit

Permalink
Merge branch 'PR/197'
Browse files Browse the repository at this point in the history
Closes #197, #185, #196
  • Loading branch information
frej committed Feb 9, 2020
2 parents 29a457e + 0b6b83c commit 595587b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions hg-fast-export.py
Original file line number Diff line number Diff line change
Expand Up @@ -323,8 +323,8 @@ def get_branchname(name):
# 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))
Expand Down

0 comments on commit 595587b

Please sign in to comment.