13
13
One way to work around this problem is to Ctrl+C the branch operation
16
I am unable to access a repository that requires user/password authentication.
17
------------------------------------------------------------------------------
16
I am unable to access a repository that requires user/password authentication or uses self-signed SSL certificates
17
------------------------------------------------------------------------------------------------------------------
18
18
The Python bindings required for password prompting are only present in
19
19
version 1.5 of Subversion so password prompting is only possible if
20
20
you have that version installed.
22
If you have an older version installed, bzr-svn can
23
use passwords cached by Subversion. Subversion can be forced to cache
24
the password by accessing the repository using the Subversion command-line
25
client. For example, try running 'svn info <url>'. If you are using a
26
Subversion repository over http or https it may be necessary to prefix the
27
repository URL with "svn+", e.g.
22
If you have an older version of Subversion installed, bzr-svn can
23
use passwords cached by Subversion or credentials specified in the URL.
25
Subversion can be forced to cache the password by accessing the repository
26
using the Subversion command-line client.
27
For example, try running 'svn info <url>'.
29
You can specify the username and password in the URL in the standard way, e.g.::
31
$ bzr co svn+http://guest:@tortoisesvn.tigris.org/svn/tortoisesvn/trunk
33
If you are using a Subversion repository over http or https it may be
34
necessary to prefix the repository URL with "svn+", e.g.
28
35
svn+http://svn.python.org/projects/python/trunk/
30
37
Trying to branch into repository gives an error about incompatibility.
31
38
----------------------------------------------------------------------
33
39
Creating a repository and then trying to clone a Subversion branch into
34
40
that repository may cause the following error:
71
77
$ bzr ls -rsvn:34 svn://example.com/bar
73
Bazaar reports branches have diverged while pulling, when they haven't
74
----------------------------------------------------------------------
79
After upgrading bzr-svn, Bazaar reports branches have diverged while pulling, when they haven't
80
-----------------------------------------------------------------------------------------------
75
81
As of version 0.4, bzr-svn creates revisions with different revision ids than
76
82
previous versions. In other words, existing bzr-svn branches created with
77
83
0.3.x can not be used directly with 0.4.0 but will have to be upgraded to
86
92
more information about how to do this.
88
94
You also need to enable support for this in bzr-svn by setting
89
override-svn-revprops to True in ~/.bazaar/bazaar.conf.
95
``override-svn-revprops`` to True in ~/.bazaar/bazaar.conf.
91
97
I converted my Subversion repository using svn-import, but now all branches are empty!
92
98
--------------------------------------------------------------------------------------
95
101
the working trees, run "bzr checkout" in the branch or
96
102
specify --trees to svn-import.
98
bzr-svn did a replace operation when I tried to push a merge commit to Subversion
99
---------------------------------------------------------------------------------
100
Yes, this is because bzr-svn has to preserve the left-hand side history of your
104
bzr-svn did a replace operation on the branch I pushed to when I tried to push a merge commit to Subversion
105
-----------------------------------------------------------------------------------------------------------
106
Yes, this is because bzr-svn has to preserve the mainline history of your
103
109
If you would like to avoid this, use a checkout and merge into that ("bzr co")
104
or rebase on trunk rather than merge it.
110
or rebase on trunk rather than merge it.
115
bzr: ERROR: These branches have diverged. Try using "merge" and then "push".
116
$ bzr rebase ../trunk
117
All changes applied successfully.
120
All changes applied successfully.
121
Pushed up to revision 1075.
123
If you would like to forbid Bazaar from ever doing these operations, set the
124
``append-revisions-only`` setting to True for the repository you're
127
bzr-svn sets all kinds of file properties when pushing revisions into Subversion. Is this really necessary?
128
-----------------------------------------------------------------------------------------------------------
129
Yes, this is because bzr-svn actually supports pushing to Subversion
130
retaining the exact same history that is in the Bazaar branch
131
you're pushing. These properties are used for storing Bazaar metadata that
132
can not be losslessly mapped to existing Subversion metadata.
134
It would be possible to support pushing changes to Subversion without
135
setting that metadata but then the revision created in Subversion
136
would actually be a different one than in your local branch.
137
You would get a DivergedBranches error when pulling from a svn branch you have
140
We have considered setting revision properties with this metadata
141
rather than file properties so they don't show up in "svn diff" but
142
that requires more work in bzr-svn. Being able to set custom revision
143
properties also depends on Subversion 1.5 on the server or modification of the
144
default repository hooks.
146
If you are using trac, you can get it to ignore these file properties by
147
setting the "hide_properties" setting in the browser section of your
148
configuration to a list of properties that should not be displayed by trac,
152
hide_properties = svk:merge, bzr:file-ids, bzr:merge, bzr:revision-info
154
Is it possible to not use the on-disk cache?
155
--------------------------------------------
157
Yes, simply set "use-cache = False" for the repository in question in ~/.bazaar/subversion.conf.
158
This will of course have some consequences for the performance of bzr-svn since it
159
will have to re-fetch data.
added
removed
FAQ
