wiki replica is overwriting changes done on the wiki
in tpo/web/team#28 (closed) we have an example of someone (@kez) making changes to the wiki and having those changes completely overwritten by this replica.
wiki changes shouldn't be overwritten like this.
yesterday, i thought i was dreaming, but now I can definitely confirm this happened. I had the commits from the wiki in my local git repo:
anarcat@curie:help.torproject.org(master)$ git lg --all
* 91a0b3d (HEAD -> master, origin/master, origin/HEAD) cross-reference the two mailing lists servers (il y a 18 heures) <Antoine Beaupré>
* 96d6b46 lint (il y a 18 heures) <Antoine Beaupré>
* 2b228aa refresh report / upgrades (il y a 18 heures) <Antoine Beaupré>
| * 128fed0 (wiki/master) Rework the rfc outline per anarcat's advice (il y a 19 heures) <kezzle>
| * 3da97e2 *Re*-Create TPA RFC 16: Replacing lektor i18n plugin (the old one disappeared?) (il y a 19 heures) <kezzle>
|/
* 145f290 fix link to gitlab docs (il y a 19 heures) <Antoine Beaupré>
and then I did a git remote update
to pull changes from all the remotes:
anarcat@curie:help.torproject.org(master)$ git ru
Récupération de origin
remote: Enumerating objects: 22, done.
remote: Counting objects: 100% (22/22), done.
remote: Compressing objects: 100% (10/10), done.
remote: Total 17 (delta 12), reused 12 (delta 7), pack-reused 0
Dépaquetage des objets: 100% (17/17), 4.39 Kio | 499.00 Kio/s, fait.
Depuis https://gitlab.torproject.org/tpo/tpa/wiki-replica
91a0b3d..32eda62 master -> origin/master
Récupération de wiki
Depuis https://gitlab.torproject.org/tpo/tpa/team.wiki
+ 128fed0...32eda62 master -> wiki/master (mise à jour forcée)
notice the last one? that's the refs of my local tracking branch ref (128fed0) being overwritten with the one from the wiki-replica (32eda624). now the history from the wiki is lost:
* 32eda62 (wiki/master, origin/master, origin/HEAD) howto/postgres: adjust BASE-IS-OLD (il y a 10 heures) <Jérôme Charaoui>
* 342e2e1 Actually fix the link IDs this time (il y a 16 heures) <kez>
* b1fa31d Fix link IDs (il y a 16 heures) <kez>
* 3808f25 Add TPA-RFC 16 to the wiki (il y a 16 heures) <kez>
* 91a0b3d (HEAD -> master) cross-reference the two mailing lists servers (il y a 18 heures) <Antoine Beaupré>
This is bad! It means something (i presume the wiki-replica CI?) is overwriting changes in the wiki repository.
Edited by anarcat