On Thu, 07 Jul 2011 17:12:29 +0200, Didier Roche <didro...@ubuntu.com> wrote: > https://code.launchpad.net/~ubuntu-branches/ubuntu/oneiric/opendrim-lmp-powermanagement/oneiric-201107070710/+merge/67122 > -> the patch and content is in the source package. The thing is, as it > was the first patch, the debian/patches directory was created in both > branches, and so the ids don't match, hence the conflict. Any idea how > to detect (making a traditional diff first?) and not make the > autoimporter conflicting? > To avoid further conflicts, as I couldn't set the status to rejected but > still waiting to get the MR off the list, I set the status to WIP. I > didn't simply deleted it as maybe James wants to do some autogenerated > branch cleanup. > I filed https://bugs.launchpad.net/udd/+bug/806940
Thanks. That's not quite what happened. The issue is that the branch didn't contain the same .pc info as the unpacked source package. This is what caused the "collision", and the conflicts are just an artefact of a bug in the way that it handles that. I'll update the bug with more info. Thanks, James -- ubuntu-devel mailing list ubuntu-devel@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-devel
