Web lists-archives.com

Re: salsa.debian.org: merge requests and such




Guido Günther writes ("Re: salsa.debian.org: merge requests and such"):
> On Fri, Nov 09, 2018 at 07:42:13PM +0000, Holger Levsen wrote:
> > - git wise, I think, I reverted these commits, pushed my changes and
> >   merged the reverted commits again. No big deal, except a bit of messy
> >   history. There are several strategies to deal with, I choose the
> >   quickest path.
> 
> Maybe even simpler: Create the tag for your upload (e.g. gbp tag). 'git
> push' that tag. 'git pull' the changes (which uses the merge machinery
> in case of overlapping changes).

If you are using dgit then the git tag was of course done already for
you.  So all you need to do is:
  git pull salsa master   # makes the merge
  git push salsa master

> You then have a tag with the released package (it's not pointing to a
> commit on master but nobody says it has to) and all the changes
> integrated into master and the contributors changes will end up in the
> next release without any "messy" history due to reverts.

Precisely.

Ian.

-- 
Ian Jackson <ijackson@xxxxxxxxxxxxxxxxxxxxxx>   These opinions are my own.

If I emailed you from an address @fyvzl.net or @evade.org.uk, that is
a private address which bypasses my fierce spamfilter.