# HG changeset patch # User Stanislau Hlebik # Date 1496831744 25200 # Node ID cb29f4bffcc7202dff773f2c2bc83fbde5b1aa77 # Parent d4eb7b0640856a61ac85a9b47e418c753bbaa0e1 replay: fix tests Upstream c0b16b801687be26d14cabe501678e24b2a3c117 now may set current branch if branch is not set in extras explicitly. This diff fixes it. diff --git a/hgsubversion/replay.py b/hgsubversion/replay.py --- a/hgsubversion/replay.py +++ b/hgsubversion/replay.py @@ -181,6 +181,8 @@ def _convert_rev(ui, meta, svn, r, tbdel copied=copied) meta.mapbranch(extra) + if 'branch' not in extra: + extra['branch'] = 'default' current_ctx = context.memctx(meta.repo, parents, meta.getmessage(rev),