<borneoa_>
PaulFertser: looks like the search for conflicts identifies changes just by filename, not by changed line. A bug in this version of gerrit? I will check the source code to get any hint. Do you remember which version of gerrit was installed before?
Haohmaru has joined #openocd
<PaulFertser>
borneoa_: 2.13.6
<PaulFertser>
borneoa_: please hold on, I'm checking myself
<PaulFertser>
borneoa_: the source code mentions SubmitDryRun so it can't be just the filenames.
<borneoa_>
PaulFertser: if I search open and cortex_m.c I get 20 hits, so the 13 conflicting with 6508 are not for filename only
Hawk777 has quit [Quit: Leaving.]
<PaulFertser>
borneoa_: probably it does something like git fetch https://review.openocd.org/openocd refs/changes/08/6508/1 && git checkout FETCH_HEAD ; git fetch https://review.openocd.org/openocd refs/changes/19/6319/5 && git cherry-pick FETCH_HEAD and that fails, hence the conflict.
<borneoa_>
PaulFertser: could be, and probably the change 6319 was not mergeable anymore by itself
<borneoa_>
PaulFertser: all the changes in conflict are with "merge conflict" status
<PaulFertser>
borneoa_: but it doesn't really mean you do not want to see them, and they're still somehow related apparently, at least changing the same file.
<PaulFertser>
It's unclear how this can be improved.
<Haohmaru>
with ketchup ;P~
<borneoa_>
PaulFertser: I would left it as is and just think it over.
Steffanx has quit [Ping timeout: 250 seconds]
Steffann has joined #openocd
tomtastic has quit [Ping timeout: 250 seconds]
tomtastic_ has joined #openocd
tarekb has joined #openocd
nathanhi has joined #openocd
<tarekb>
Hi Paul, All, I hope you are doing well
<tarekb>
PaulFertser: I have encountered some handshake failres with gerrit redirection from zylin server to the new one
<tarekb>
s/failres/failures/
<tarekb>
I hope this is only my case (everything is OK after changing the server in my config to the new one)
<PaulFertser>
tarekb: hey :) ssh config?
<tarekb>
I have changed both my git remote url and added an entry in ~/.netrc
<tarekb>
to use directly the review.openocd.org server
<tarekb>
theoritacally passing by the old server should be OK and redirected without issues, but in my setup, I'm facing hanshake failures 4/10 times
<PaulFertser>
tarekb: handshake with what protocol/utility?