[PATCH 1 of 4] Add --import-branch option to hg import to pull in branch information without --exact

[Thomas Arendsen Hein]

* Eric Hopper <hopper at omnifarious.org> [20070614 18:25]:
> # HG changeset patch
> # User Eric Hopper <hopper at omnifarious.org>
> # Date 1181836911 25200
> # Node ID 75a66022a47337f481799e25ec4933166ef8e5d0
> # Parent  7de7a80e742207204969f85188e6c4d6c6b493bd
> Add --import-branch option to hg import to pull in branch information without --exact

Pushed to crew, directly followed by a patch which shows that we
might need a test case for this :)

Thomas


# HG changeset patch
# User Thomas Arendsen Hein <thomas at intevation.de>
# Date 1182082290 -7200
# Node ID 2937d0dbfab008e90a9af07112f54167ef1ecc08
# Parent  5243cece3d977f88eaade0b046d40647ec9b9e37
Make --import-branch option actually work (- is translated to _)

diff -r 5243cece3d97 -r 2937d0dbfab0 mercurial/commands.py
--- a/mercurial/commands.py	Thu Jun 14 09:01:51 2007 -0700
+++ b/mercurial/commands.py	Sun Jun 17 14:11:30 2007 +0200
@@ -1522,7 +1522,7 @@ def import_(ui, repo, patch1, *patches, 
                         repo.dirstate.setparents(p1, p2)
                 except hg.RepoError:
                     pass
-            if opts.get('exact') or opts.get('import-branch'):
+            if opts.get('exact') or opts.get('import_branch'):
                 repo.dirstate.setbranch(branch or 'default')
 
             files = {}

-- 
thomas at intevation.de - http://intevation.de/~thomas/ - OpenPGP key: 0x5816791A
Intevation GmbH, Osnabrueck - Register: Amtsgericht Osnabrueck, HR B 18998
Geschaeftsfuehrer: Frank Koormann, Bernhard Reiter, Dr. Jan-Oliver Wagner
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial-devel/attachments/20070617/82f06ddb/attachment.pgp