Resolving diverged branches in Subversion repository

[Russel Winder]

On Tue, 2008-06-17 at 21:50 +0200, Christophe TROESTLER wrote:
> On Tue, 17 Jun 2008 18:37:41 +0100, Russel Winder wrote:
> > 
> > If Subversion is being used as a repository of Bazaar branches then the
> > current bzr-svn behaviour is necessary (SVK does the same).  
> 
> I hope we can keep this -- because this is how I usually use SVN
> repositories.

I am sure Jelmer will agree since that is how he designed the bzr-svn
plugin to work, and I have no problem with that since it serves a need,
yours and his at the very least :-)

It is however only one of two use cases:

1.  Subversion repository stores a Bazaar branch.
2.  Bazaar as intelligent Subversion client.

bzr-svn handles 1 well and as a consequence can do 2 but with a lot of
overhead that is not needed and slows things down a lot.  git-svn cannot
handle 1 (obviously :-) nor can it store a Git repository, but it
handles 2 very nicely (if you can stand using Git).  I am not sure where
Mercurial is but last time I heard its interaction with a Subversion
repository was very poor.

Clearly 1 is a need or Jelmer would not have written bzr-svn as he has.
What I am arguing is that perhaps there is a need to support 2 better
than the way in which things work now.  Rather than create a whole new
plugin, it seems more straightforward to have bzr-svn work in two modes
as in the two use cases above.  This would mean that a whole lot less
processing would be done when pulling, rebasing and pushing in mode 2
and so make things much, much faster.  Not to mention not creating very
large property change reports.  Mode 1 would, of course, behave as it
does now since that is required in order to support the functionality.

-- 
Russel.
====================================================
Dr Russel Winder                 Partner

Concertant LLP                   t: +44 20 7585 2200, +44 20 7193 9203
41 Buckmaster Road,              f: +44 8700 516 084
London SW11 1EN, UK.             m: +44 7770 465 077
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080618/a42e482c/attachment.pgp