summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2012-03-22 17:37:43 +0100
committerJelmer Vernooij <jelmer@samba.org>2012-03-22 17:37:43 +0100
commitb3cda9967f857127bd4dab5eb72223a95916f5ea (patch)
tree64bc9ffb0b90d49f9846b9ed179cb6f4e96fe7b8
parentf5fca7c6944e92206a5488aecb81779fd52bfdd1 (diff)
downloadbzr-fastimport-b3cda9967f857127bd4dab5eb72223a95916f5ea.tar.gz
Remove trailing whitespace.baserock/morph
-rw-r--r--cmds.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/cmds.py b/cmds.py
index 128b1be..5f93105 100644
--- a/cmds.py
+++ b/cmds.py
@@ -94,7 +94,7 @@ class cmd_fast_import(Command):
option.
.. note::
-
+
To maintain backwards compatibility, fast-import lets you
create the target repository or standalone branch yourself.
It is recommended though that you let fast-import create
@@ -103,7 +103,7 @@ class cmd_fast_import(Command):
:Branch mapping rules:
Git reference names are mapped to Bazaar branch names as follows:
-
+
* refs/heads/foo is mapped to foo
* refs/remotes/origin/foo is mapped to foo.remote
* refs/tags/foo is mapped to foo.tag
@@ -161,12 +161,12 @@ class cmd_fast_import(Command):
bill = William Jones <bill@example.com>
then user-ids are mapped as follows::
-
+
maria => maria <maria@example.com>
bill => William Jones <bill@example.com>
.. note::
-
+
User mapping is supported by both the fast-import and
fast-import-filter commands.
@@ -178,9 +178,9 @@ class cmd_fast_import(Command):
used when, along with some other statistics (e.g. total number of
commits). In the second pass, it generates the repository and
branches.
-
+
.. note::
-
+
The initial pass isn't done if the --info option is used
to explicitly pass in information about the input stream.
It also isn't done if the source is standard input. In the
@@ -382,12 +382,12 @@ class cmd_fast_import_filter(Command):
bill = William Jones <bill@example.com>
then user-ids are mapped as follows::
-
+
maria => maria <maria@example.com>
bill => William Jones <bill@example.com>
.. note::
-
+
User mapping is supported by both the fast-import and
fast-import-filter commands.
@@ -641,7 +641,7 @@ class cmd_fast_export(Command):
To import several unmerged but related branches into the same repository,
use the --{export,import}-marks options, and specify a name for the git
branch like this::
-
+
bzr fast-export --export-marks=marks.bzr project.dev |
GIT_DIR=project/.git git-fast-import --export-marks=marks.git