On Mon, Jun 13, 2016 at 01:58:11PM +0100, Robie Basak wrote: > Presumably I would need to push to the repository before uploading, so > that the importer will pick up my commit in favour of importing its own > even after we have it running automatically. I wonder though if it would > be better to push to some other branch or tag (or even no branch, just > the upload/<version> tag), and let the importer pull that into the > correct pocket branch? > > If so, could it detect that the one of the parents of my upload commit > is the same as that of the current pocket branch pointer, and just move > the pocket branch pointer up? Is this logic sound?
Taking this one step further, what if the user doesn't run "usd-merge commit" at all, and just pushes to an upload/<version> tag? This would have debian/sid (the new merge base) as an ancestor, but not the pocket branch. Then could the importer create the merge commit instead? -- ubuntu-server mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-server More info: https://wiki.ubuntu.com/ServerTeam
