A few thoughts on foreign integration...

[John Szakmeister]

On Mon, Oct 18, 2010 at 5:16 PM, Jelmer Vernooij <jelmer at samba.org> wrote:
[snip]
> 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?

No, I'm using straight push.  However, the other end is using
Subversion (not Bazaar), so when they integrate our current version of
the branch, and I merge in their branch, that's when the conflicts
happen.  It all makes sense.  Bazaar doesn't know the appearance of
the file was because someone merged my branch into their branch.  So,
it does exactly what it should do, and assigning the file (or dir) a
new file id.  File ids hurt when doing this foreign integration stuff.
:-)  There is more than just me on my end, so rebasing or killing all
our branches and re-pulling is a non-starter too.

Just to recap, here is what's happening:

* We branch their trunk
* We make some changes and push them into our branch in SVN
* They use SVN and merge the changes back into trunk
* We merge the latest trunk, and get conflicts on any file or
directory that we added

I hope that makes sense. :-)

> (skipping the rest of your email for the moment)

No worries.  Thanks!

-John