Re: english/devel/join/index doesn't add up properly

Hi,

Andreas Ronnquist <[email protected]> wrote:s:
> 
> >commit 6403b81ac51ae4a449df5d367694633c21274e04
> >Author: Taowa <taowa@*****.**>
> >Date:   Fri Dec 13 19:53:04 2019 -0500
> >
> >    Changed 'Packaging' to 'Uploading' in NM corner so as to have
> > consistent names for DDs
> >
> >commit dc6a015a65201298499871dbc8d734bbea971450
> >Author: Taowa <taowa@*****.**>
> >Date:   Fri Dec 13 19:49:40 2019 -0500
> >
> >    updated NM corner to show that dd_nu can upload as dm - see
> > https://salsa.debian.org/ftp-team/dak/commit/39205cff6633040adecfdf0f7e4e5db06431a03c
> >
> >commit aedba88f0c7572ec26770e786608b2be7d5e3001
> >Author: Kåre Thor Olsen <kaare>
> >Date:   Wed May 6 18:04:13 2015 +0000
> >
> >    Fixing wording, with thanks to a friend of paultag
> >    
> >    CVS version numbers
> >    
> >    english/devel/join/index.wml: 1.48 -> 1.49
> >
> 
> and I do have the translation-check set to
> 6403b81ac51ae4a449df5d367694633c21274e04
> 
> in the swedish/devel/join/index.wml. I have a hard time figuring out
> why the commit 6403b81ac51a isn't regarded as the latest for that
> specific page.
> 
> Can anybody explain this? 1e104c09c0ba is from October if I simply run
> a "git show" on it, while 6403b81ac51a is from December as you clearly
> can see in the log above, but the log doesn't list 1e104c09c0ba.

In fact, 6403b81ac51a is from December 2019, while 1e104c09c0ba is from 
October 2020. So 1e104c09c0ba *is* the latest one.
https://salsa.debian.org/webmaster-team/webwml/commits/1e104c09c0ba7202066c14a95294b7f27e9ff42d/english/devel/join/index.wml
lists them.
 
> Is this simply someone who has done a reset and force-pushed when they
> shouldn't have? How do we solve stuff like this in the best way?

I suspect this is somehow related to merging the new-homepage branch to
master? I have already noticed other similar cases. 
Things are not 100% ok here apparently, but bumping the commit hash to
1e104c09c0ba7202066c14a95294b7f27e9ff42d should do the trick here, I think
(I did that for german right now)

'git diff 6403b81ac51a..1e104c09c0ba -- english/devel/join/index.wml'
does not show any differences here.


Holger


-- 
Holger Wansing <[email protected]>
PGP-Fingerprint: 496A C6E8 1442 4B34 8508  3529 59F1 87CA 156E B076