##// END OF EJS Templates
Add --import-branch option to hg import to pull in branch information without --exact
Eric Hopper -
r4592:5243cece default
parent child Browse files
Show More
@@ -1514,7 +1514,6 b' def import_(ui, repo, patch1, *patches, '
1514 if p1 != wp[0].node():
1514 if p1 != wp[0].node():
1515 hg.clean(repo, p1, wlock=wlock)
1515 hg.clean(repo, p1, wlock=wlock)
1516 repo.dirstate.setparents(p1, p2)
1516 repo.dirstate.setparents(p1, p2)
1517 repo.dirstate.setbranch(branch or 'default')
1518 elif p2:
1517 elif p2:
1519 try:
1518 try:
1520 p1 = repo.lookup(p1)
1519 p1 = repo.lookup(p1)
@@ -1523,6 +1522,8 b' def import_(ui, repo, patch1, *patches, '
1523 repo.dirstate.setparents(p1, p2)
1522 repo.dirstate.setparents(p1, p2)
1524 except hg.RepoError:
1523 except hg.RepoError:
1525 pass
1524 pass
1525 if opts.get('exact') or opts.get('import-branch'):
1526 repo.dirstate.setbranch(branch or 'default')
1526
1527
1527 files = {}
1528 files = {}
1528 try:
1529 try:
@@ -2803,7 +2804,9 b' table = {'
2803 ('f', 'force', None,
2804 ('f', 'force', None,
2804 _('skip check for outstanding uncommitted changes')),
2805 _('skip check for outstanding uncommitted changes')),
2805 ('', 'exact', None,
2806 ('', 'exact', None,
2806 _('apply patch to the nodes from which it was generated'))] + commitopts,
2807 _('apply patch to the nodes from which it was generated')),
2808 ('', 'import-branch', None,
2809 _('Use any branch information in patch (implied by --exact)'))] + commitopts,
2807 _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')),
2810 _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')),
2808 "incoming|in": (incoming,
2811 "incoming|in": (incoming,
2809 [('M', 'no-merges', None, _('do not show merges')),
2812 [('M', 'no-merges', None, _('do not show merges')),
General Comments 0
You need to be logged in to leave comments. Login now