On Mon, 24 Sep 2018, Andreas Tille wrote:
> Probably due to racing condition since I migrated the repository before > your pushes. > > > either needed to be imported as quilt patches or alternatively you can > > > use git mode in d/watch which creates a new tarball for you > > > incorporating the latest state of upstream Git (I doubt that would be a > > > sensible solution in the current case). > > if we are to stay with my non conventional setup of sitting straight on > > top of the upstream git repo, then we would just need to merge > > debian-0.20 branch into debian branch (might be a fast-forward) whenever > > we are ready to upload that beast. > I confirm that there are cases where this workflow makes sense. We need > to outweight pros and cons. To say the truth, I am no longer sure since it is possible to still have regular upstream repo as a remote and dedicated branches for them in the same git repo (locally), so I could still cherry pick etc. Pretty much what I do eg for cython etc. That is why I am agreeing to go "standard" so to make life easier for others as well. My only concern with the "standard" workflow ATM is that pristine-tar is not as reliable as needed to be. # of open issues manifests to that https://bugs.debian.org/cgi-bin/pkgreport.cgi?pkg=pristine-tar;dist=unstable and Joey himself moved from using it to dgit AFAIK. But anyways it is unrelated to this discussion, sorry for bringing it up ;( > > ... > > If we are to convert to the more conventional gbp workflow (I am ok with > > that now ;)) , I guess the best would be to just reimport from the > > snapshots entire history of the package and proceed from there. Then > > commits in debian-0.20 would need to be rebased (or cherry picked or > > your suggested format-patch+am) to stay on top of the "master" > > branch > I hope I will find the time tomorrow or the day after tomorrow. thanks > > and picking any needed changes, would be appreciated. I will adjust ;) > I'll check what might be the easier solution and will come back once I > did so. Hopefully you will have solved the ssh issue meanwhile. I will try again later today, and when home (different network/provider) -- Yaroslav O. Halchenko Center for Open Neuroscience http://centerforopenneuroscience.org Dartmouth College, 419 Moore Hall, Hinman Box 6207, Hanover, NH 03755 Phone: +1 (603) 646-9834 Fax: +1 (603) 646-1419 WWW: http://www.linkedin.com/in/yarik
