Rev 1189: Clarify FAQ about dpush. in file:///data/jelmer/bzr-svn/dpush/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/dpush/

------------------------------------------------------------
revno: 1189
revision-id: jelmer at samba.org-20080629014306-shgxutyy3rtrrls8
parent: jelmer at samba.org-20080629013804-dfkyd0zksxngb1b3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: dpush
timestamp: Sun 2008-06-29 03:43:06 +0200
message:
  Clarify FAQ about dpush.
modified:
  FAQ                            faq-20070910195147-p9u38s9wplds2d4o-1
=== modified file 'FAQ'
--- a/FAQ	2008-06-22 08:09:10 +0000
+++ b/FAQ	2008-06-29 01:43:06 +0000
@@ -116,9 +116,12 @@
 you're pushing. These properties are used for storing Bazaar metadata that 
 can not be losslessly mapped to existing Subversion metadata. 
 
-It would be possible to support pushing changes to Subversion without
-setting that metadata but then the revision created in Subversion
-would actually be a different one than in your local branch. 
+It is possible to push changes to Subversion without
+setting that metadata by using the ``bzr dpush`` command. 
+Since revisions created in Subversion this way are actually (slightly) different 
+from the matching revisions in the local branch, it is necessary for the dpush command 
+to rebase your branch to the remote branch after pushing.
+
 You would get a DivergedBranches error when pulling from a svn branch you have 
 just pushed to.