diff options
| author | Richard Wilbur <richard.wilbur@gmail.com> | 2014-04-15 23:59:09 -0600 |
|---|---|---|
| committer | Richard Wilbur <richard.wilbur@gmail.com> | 2014-04-15 23:59:09 -0600 |
| commit | b7b3d7f360c9f8c0d7315aae56bca63ad9f48411 (patch) | |
| tree | e123c1c42dbca1c8d54014eb55fdf507130240ff | |
| parent | 77b2c2fe733f9ada57878c60814d4224804d74f6 (diff) | |
| download | bzr-fastimport-b7b3d7f360c9f8c0d7315aae56bca63ad9f48411.tar.gz | |
Add NEWS entries for recent changes and additional documentation for new option.(Richard Wilbur)
| -rw-r--r-- | NEWS | 11 | ||||
| -rw-r--r-- | cmds.py | 7 |
2 files changed, 18 insertions, 0 deletions
@@ -6,12 +6,23 @@ bzr-fastimport Release Notes 0.14 UNRELEASED +Compatibility +------------- + +* Replace Repo.get_ancestry(as per #1040560), which is removed in bzr 2.6. + (Zygmunt Krynicki) + Bug fixes --------- * Print sane error when a fastimport file is incomplete. (Jelmer Vernooij, #937972) +Features +-------- + +* New option --no-tags for 'bzr fast-export'. (Alex Usov) + 0.13 2012-02-29 Changes @@ -650,6 +650,13 @@ class cmd_fast_export(Command): If you get a "Missing space after source" error from git-fast-import, see the top of the commands.py module for a work-around. + + Since bzr uses per-branch tags and git/hg use per-repo tags, the + way bzr fast-export presently emits tags (unconditional reset & + new ref) may result in clashes when several different branches + are imported into single git/hg repo. If this occurs, use the + bzr fast-export option --no-tags during the export of one or more + branches to avoid the issue. """ hidden = False _see_also = ['fast-import', 'fast-import-filter'] |