Collision branches

[Barry Warsaw]

On Oct 06, 2011, at 03:27 PM, Jonathan Riddell wrote:

>I also found a strange case in python3-defaults where there is nothing to
>merge, spooky.

I just worked on python3-defaults yesterday.  There's definitely something
weird going on with that package, which james_w and I chatted about.  I tried
to `bzr merge-package debianlp:python3-defaults` but that resulted in a lot of
conflicts on the debian directory itself, and the files within it.  I ended up
doing a manual (read: diff+hand-patch) merge of the sid branch, but that's not
going to help for the next time.

I was planning on doing the painful merge on this package after P opens up,
just so we can get a common ancestor and move forward properly from there.  If
you have any chance to look at the two branches in the meantime, that would be
great.

-Barry