Mercurial > hg-stable
changeset 4592:5243cece3d97
Add --import-branch option to hg import to pull in branch information without --exact
| author | Eric Hopper <hopper@omnifarious.org> |
|---|---|
| date | Thu, 14 Jun 2007 09:01:51 -0700 |
| parents | 9ec0a3b6a18a |
| children | 2937d0dbfab0 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Thu Jun 14 16:19:58 2007 -0700 +++ b/mercurial/commands.py Thu Jun 14 09:01:51 2007 -0700 @@ -1514,7 +1514,6 @@ if p1 != wp[0].node(): hg.clean(repo, p1, wlock=wlock) repo.dirstate.setparents(p1, p2) - repo.dirstate.setbranch(branch or 'default') elif p2: try: p1 = repo.lookup(p1) @@ -1523,6 +1522,8 @@ repo.dirstate.setparents(p1, p2) except hg.RepoError: pass + if opts.get('exact') or opts.get('import-branch'): + repo.dirstate.setbranch(branch or 'default') files = {} try: @@ -2803,7 +2804,9 @@ ('f', 'force', None, _('skip check for outstanding uncommitted changes')), ('', 'exact', None, - _('apply patch to the nodes from which it was generated'))] + commitopts, + _('apply patch to the nodes from which it was generated')), + ('', 'import-branch', None, + _('Use any branch information in patch (implied by --exact)'))] + commitopts, _('hg import [-p NUM] [-m MESSAGE] [-f] PATCH...')), "incoming|in": (incoming, [('M', 'no-merges', None, _('do not show merges')),