9 Apr
2017
9 Apr
'17
9:38 p.m.
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".
What should I do to get this merged?
--
- Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)
10 Apr
10 Apr
8:49 a.m.
New subject: jenkins / Re: gerrit trouble "Change is New"
Hi all,
it now gets even more mysterious:
Some patches have failed in the most recent re-upload. See for example
https://gerrit.osmocom.org/#/c/2215/5
which links to Gerrit
http://jenkins.osmocom.org/jenkins/job/libosmo-sccp-gerrit/311/
but then that link is dead.
Does anyone know what's happening here? Why is gerrit loosing
information about t given build?
--
- Harald Welte <laforge(a)gnumonks.org> http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)
9:26 a.m.
New subject: jenkins / Re: gerrit trouble "Change is New"
On 10. Apr 2017, at 14:49, Harald Welte
<laforge(a)gnumonks.org> wrote:
Hi all,
Hey!
it now gets even more mysterious:
I don't have an answer for the "Change is New" but this problem is
"easy" to understand.
http://jenkins.osmocom.org/jenkins/job/libosmo-sccp-gerrit/311/
but then that link is dead.
Does anyone know what's happening here? Why is gerrit loosing
information about t given build?
Jenkins is configured to only keep build logs for X days or Y
amount of builds. In the libosmo-sccp-gerrit case X and Y are 30.
Given from where I come from I am for putting a limit to the disk
space used by build logs but 30 is obviously too small. I am changing
it to 30 days and 120 logs for all gerrit logs.
holger
11:57 a.m.
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 <laforge(a)gnumonks.org> http://laforge.gnumonks.org/
============================================================================
"Privacy in residential applications is a desirable marketing option."
(ETSI EN 300 175-7 Ch. A6)
12:38 p.m.
On 10.04.2017 11:57, Harald Welte wrote:
I hope we won't have to have introduce extra "gerrit spaces" in all our
new code :/
In case of patch series another workaround would be to re-arrange the sequence of
patches bringing another patch to the "top" of the series. It's not much
more
meaningful than "gerrit spaces" but might be quicker/easier (at least that's
the case
with Emacs' magit :)
--
Max Suraev <msuraev(a)sysmocom.de> http://www.sysmocom.de/
=======================================================================
* sysmocom - systems for mobile communications GmbH
* Alt-Moabit 93
* 10559 Berlin, Germany
* Sitz / Registered office: Berlin, HRB 134158 B
* Geschaeftsfuehrer / Managing Director: Harald Welte
19 Apr
19 Apr
1:30 p.m.
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".
I've had this problem for a very long time and have mailed here about it.
Basically if you have a private branch based on current 'master', gerrit
will fail to merge the same patches. As soon as 'master' has moved on so
that your private branch is based on an older revision than master HEAD,
the merge will work again. Because I have the admin rights to do so, I
usually do a manual push to master instead.
See also
http://osmocom.org/projects/cellular-infrastructure/wiki/Gerrit#Merge-patch…
and
https://bugs.chromium.org/p/gerrit/issues/detail?id=4158
which unfortunately hasn't concluded in a solution
--- or so I thought! There has been activity on this ticket since I last
looked at it, it seems they've actually fixed the problem in 2.12.6, yay!
I will upgrade gerrit one of these days...
~N
23 Apr
23 Apr
1:06 p.m.
On 19. Apr 2017, at 13:30, Neels Hofmeyr
<nhofmeyr(a)sysmocom.de> wrote:
--- or so I thought! There has been activity on this ticket since I last
looked at it, it seems they've actually fixed the problem in 2.12.6, yay!
I will upgrade gerrit one of these days...
the upgrade occurred yesterday. Please have a look at how it behaves.
holger
25 Apr
25 Apr
1:37 p.m.
On Sun, Apr 23, 2017 at 01:06:29PM +0200, Holger Freyther wrote:
I tested with the sandbox https://gerrit.osmocom.org/2402 and it seems to
work now! Thanks!!
Excellent, I've been looking forward to this for a long time :)
~N
On 19. Apr 2017, at 13:30, Neels Hofmeyr
<nhofmeyr(a)sysmocom.de> wrote:
--- or so I thought! There has been activity on this ticket since I last
looked at it, it seems they've actually fixed the problem in 2.12.6, yay!
I will upgrade gerrit one of these days...
the upgrade occurred yesterday. Please have a look at how it behaves.
2568
days inactive
2584
days old
7 comments
4 participants
participants (4)
-
Harald Welte -
Holger Freyther -
Max -
Neels Hofmeyr