On Fri, 2011-06-03 at 07:44 -0700, Allison Randal wrote:
> As I was working on packages this week, I wondered if there might be a
> way to use all the great UDD tools/techniques on packages even when the
> importer failed and there is no up-to-date bzr branch available in
> launchpad.
> 
> I noticed at the bottom of the UDD Intro page that there's a technique
> given to create a one-off bzr branch from a Debian .dsc file:
> 
> http://people.canonical.com/~dholbach/packaging-guide/html/udd-intro.html

> Would that same technique work for Ubuntu packages (*only* where the
> import has failed)? Or, is there another simple technique we could
> recommend? My idea is that this "local" branch would be discarded once
> the import succeeds, it's just a convenience to avoid falling back on
> merge-o-matic or a manual merge.
Assuming the Debian version and their common ancestor version already
have already been successfully imported, that should indeed be
sufficient to do a merge as far as I know.

That said, the importer uses much of the same code underneath as
import-dsc so if one fails, there's a fair chance the other will fail
too. For example, packages with multiple upstream tarballs will fail
with both tools. On the other hand, if there's one particular
problematic version of the package, you could skip that when you
manually import.

Merging bzr branches with quilts is also still fairly problematic. We're
looking to address this by custom behaviour in merge, but until that's
happened merge-o-matic will probably be less painful than a merge in the
UDD branches.

Cheers,

Jelmer

Attachment: signature.asc
Description: This is a digitally signed message part

-- 
ubuntu-distributed-devel mailing list
[email protected]
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel

Reply via email to