Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 50263:798e4314ddd9
branch: pass current transaction when writing branch in import
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Thu, 02 Mar 2023 14:45:39 +0100 |
parents | ee7a7155de10 |
children | 4fafc6642bee |
comparison
equal
deleted
inserted
replaced
50262:e27a5a012323 | 50263:798e4314ddd9 |
---|---|
2029 updatefunc(repo, p1.node()) | 2029 updatefunc(repo, p1.node()) |
2030 if p2 != parents[1]: | 2030 if p2 != parents[1]: |
2031 repo.setparents(p1.node(), p2.node()) | 2031 repo.setparents(p1.node(), p2.node()) |
2032 | 2032 |
2033 if opts.get(b'exact') or importbranch: | 2033 if opts.get(b'exact') or importbranch: |
2034 repo.dirstate.setbranch(branch or b'default') | 2034 repo.dirstate.setbranch( |
2035 branch or b'default', repo.currenttransaction() | |
2036 ) | |
2035 | 2037 |
2036 partial = opts.get(b'partial', False) | 2038 partial = opts.get(b'partial', False) |
2037 files = set() | 2039 files = set() |
2038 try: | 2040 try: |
2039 patch.patch( | 2041 patch.patch( |