Hi Jan, On Wed, Feb 27, 2008 at 08:20:40PM +0100, Jan Luebbe wrote: > Currently git-debimport only merges the branches together for the last > version.
IIRC, the main reason I wimped out and did it this way is that I was worried that packages with debian diffs which include changes to upstream files could generate merge conflicts which would halt the automated import. Since we 'know' such conflicts will be resolved by the next diff.gz import (in the way that they were initially), we don't really want that to happen. This script was also a fairly quick and dirty hack too, but since it's turning into more than that now, this is worth looking at again ;) At the time, just joining the heads so that future development could get off on the right foot was enough ... > This patch will merge the upstream into debian before > applying the .diff.gz. > > As a result, the commit for the .diff.gz only contains the changes to > the debian metadata. ... but indeed, this does seem like a desirable and useful thing to do. My question then, before I apply this or something like it, is do we need to be doing something a bit more involved to ensure this really works in all cases without interruption for manual conflict resolution. Unfortunately, it's not quite clear to me yet what that should be, or if it can even be done non-interactively. We know for each new package imported on the debian branch that any conflicts which might occur with the new upstream source will be resolved by the first diff.gz applied, but I'm not really sure how we can represent that intermediate "merged upstream, but with unresolved conflicts" state which might occur. In the case of a manual import of new source that hasn't yet been packaged, the merge, the conflict, and the manual resolution, will all be reflected in the commit history, but for automatic importing of a series of existing packages, I fear there is insufficient information to reproduce such intermediate states and steps. If someone can see a nice way around that though, I'm definitely open to supporting something like this. If we can't, at best it might have to be an option that people can enable if they know the packages they are importing in fact won't generate any conflicts when merging new upstream releases... Thoughts plz? Cheers, Ron -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
