Hi again, On Sun, Apr 09, 2017 at 09:38:29PM +0200, Harald Welte wrote: > I want to merge the patchset from my libosmo-sccp sigtran branch to > master, but gerrit doesn't allow me to. > > I've re-pushed the patch set already multiple times, the last time also > doing a minor cosmetic change to the commit log message of the first > patch in the series (https://gerrit.osmocom.org/#/c/2191/). > > gerrit refuses to merge even that very first patch in the series with > "change is new".
It seems one neds to do a change in the actual source code as a work-around. I introduced an extra space somewhere in a comment, and the error is now gone. Not nice :/ I've hit again in this problem with https://gerrit.osmocom.org/#/c/2211/6 in my series, which I have now also re-submitted with a one-byte 'additional space'. Let's see if I can reproduce the result of above work-around. I hope we won't have to have introduce extra "gerrit spaces" in all our new code :/ Regards, Harald -- - Harald Welte <[email protected]> http://laforge.gnumonks.org/ ============================================================================ "Privacy in residential applications is a desirable marketing option." (ETSI EN 300 175-7 Ch. A6)
