| Re: [mdt-papyrus.dev] Lost commit from merged gerrit, how could it happen? |
|
Hi Michael, That’s indeed very surprising. I suspect a merge commit did override this contribution. And Merge commits don’t really “change” the files by themselves (The
changes are brought by the merged commit rather than the merge commit) I’ve already seen cases of merge commits erasing a previous contribution silently (i.e. the History doesn’t say anything about a change), although I don’t know
in which case this might happen. Camille De : mdt-papyrus.dev-bounces@xxxxxxxxxxx [mailto:mdt-papyrus.dev-bounces@xxxxxxxxxxx]
De la part de Michael Golubev Hello, We have found a weird situation with one of the commits from Montages team and I would like to ask for a help. I have checked and re-checked everything, but still have no idea whats going on and how this could happen. So, there is a gerrit review #36952 [1] from Dec 8, 2014 8:45 AM, with status Merged. There is also corresponding commit in git web view [2]. So far so good, now the mistery part: Here is the actual state [3] of the same file in git web UI, with the change from gerrit not applied. Note that the actual latest revision for master branch is from commit 7f7c96689f903d784acccd32355f219d223779b2, from Nov 27, 2014, so before the gerrit merge date. Note also that the git log for the same file [4] does not include the above commit from gerrit (and no December commits at all). I most probably have missed something trivial but it looks at least disturbing, does not it? Regards, Michael -- Michael "Borlander" Golubev 1165/1 Dvorecka, 14700, Prague-4 Podoli tek: +420 602 483 463 |