Rev 1174: Wording improvement in FAQ. in file:///data/jelmer/bzr-svn/0.4/
Jelmer Vernooij
jelmer at samba.org
Sun May 18 15:13:35 BST 2008
At file:///data/jelmer/bzr-svn/0.4/
------------------------------------------------------------
revno: 1174
revision-id: jelmer at samba.org-20080518141334-ejdhcpismnz397wk
parent: jelmer at samba.org-20080518123157-t6mhwqft1bgted3m
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-05-18 16:13:34 +0200
message:
Wording improvement in FAQ.
modified:
FAQ faq-20070910195147-p9u38s9wplds2d4o-1
=== modified file 'FAQ'
--- a/FAQ 2008-05-02 21:16:52 +0000
+++ b/FAQ 2008-05-18 14:13:34 +0000
@@ -103,8 +103,8 @@
bzr-svn did a replace operation on the branch I pushed to when I tried to push a merge commit to Subversion
-----------------------------------------------------------------------------------------------------------
-Yes, this is because bzr-svn has to preserve the mainline history of your
-branch.
+Yes, this is because bzr-svn has to preserve the mainline history of your Bazaar
+branch in Subversion.
If you would like to avoid this, use a checkout and merge into that ("bzr co")
or rebase on trunk rather than merge it.
More information about the bazaar-commits
mailing list