A few thoughts on foreign integration...

[Jelmer Vernooij]

Hi John!

On Mon, 2010-10-18 at 11:46 -0400, John Szakmeister wrote:
> So, as most of you already know, I've been using Bazaar to help do
> distributed Subversion development.  It's definitely got its kinks,
> but has been working fairly well.  There is one issue I'd like to find
> a way to address, either by having our team work differently (but ont
> connected, that's impossible), or by adding a feature to Bazaar.
> 
> The problem is that we need to have a long-term development branch.
> We'll integrate other branches over time, and the other side will use
> native SVN to do the same.  The problem comes in where some of our
> changes get merged into another branch (says trunk).  Any file that we
> created is given a new file id by bzr-svn.  So when we attempt to
> merge their branch later, bzr goes conflict crazy (on a smaller
> project, I'm getting ~100-150 conflicts).  Most of them are tree
> conflicts because the file we introduced have new file ids.  Actually
> content that has changed between us and trunk is actually very little.
This doesn't sound right. Are you using dpush? If you're using regular
push the file ids won't change. What sort of conflicts are you getting?

(skipping the rest of your email for the moment)

Cheers,

Jelmer
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20101018/bd8f8ed3/attachment-0001.pgp