On Tue, Mar 23, 2010 at 22:19:20 +0100, Sven Joachim wrote: > I'm not sure how to do the merge. While merging upstream-ubuntu into > upstream-experimental is a trivial fast-forward, and merging > upstream-experimental into debian-experimental is also a no-brainer, > merging ubuntu into debian-experimental resulted in quite a few things > that needed to be backed out; for instance their patch 02_nouveau_bgnr > leads to FTBFS on Debian, and I'm not sure you want all the Ubuntu > history in debian/changelog either. > > So it might be better to "merge --squash" that branch, since otherwise > we might create problems for Ubuntu (in their later merges) if we revert > many of their actions. What do you think? > I think I'd just apply the relevant parts of the ubuntu diff manually instead of doing it as a git merge. Hopefully that won't be too hard to extract, and that way we don't import the unrelated changes you mention. merge --squash and revert the changes we don't want before committing looks like would do that (I didn't know about merge --squash, thanks for the pointer!). Cheers, Julien
Attachment:
signature.asc
Description: Digital signature