Hi, On Wed, Aug 19, 2015 at 10:22:54PM +0200, Raphael Hertzog wrote: > Hi, > > On Wed, 19 Aug 2015, Guido Günther wrote: > > The patch in it's last incarnation looks good but I do wonder if we need > > this given that we have the --merge-mode=replace option in impor-orig > > now. This option works for both the upstream uses git (and has a > > debian/ dir) as well as the upstream tarball has a debian/ dir case. > > > > I'd like to keep gbp out of the "automatic" filtering as much as > > possible since in some cases the user might _want_ to have debian/ > > (e.g. if he wants to base his work on the initial upstream packaging). > > Right, but can the default of --merge-mode be "replace" by default? At > least for "3.0 (quilt)" packages?
That's the plan once this got some real world exposure. > Also I find this option strangely named. Why not > "--merge-mode=preserve-debian" for example? And --merge-mode=normal for > the other case? I looked at it from the upstream branch side: either you use "git merge" or "replace" the upstream source. More correct would be "replace-upstream-preserve-debian" but that's probably a bit long. > BTW it would be nice to be able to run such a merge as a standalone > operation, without requiring a full gbp import-orig run. Yeah, as would be the possibility to fetch debian/ from another commit (as when moving between sid and experimental). So the base line is we don't need to filter upstream by default anymore but we want some better defaults (which I agree with). Cheers, -- Guido
