Dear List, At 20140517 21:41:15 in the logs, I accidentally force pushed some commits to wesnoth master instead of my fork. The cause was carelessness / I recently had to rebuild my local repo and my remotes are named differently... upstream became origin, and origin became fork. (I will henceforth use only upstream and fork for remote names.)
The only history which was destroyed by this was two commits of Vultraz, see logs here for details: http://www.wesnoth.org/irclogs/2014/05/%23wesnoth-dev.2014-05-17.log Most unfortunately, it was impossible to restore the history exactly -- when commits are orphaned remotely, there is apparently no way to fetch them to a local repo exactly. After waiting for an hour, no one joined the channel who said they had pulled those commits, and Vultraz said that he had committed them from the web interface. I have reset to the period just before them, and recommitted them using patch files from the github web interface. So unfortunately, if you pulled wesnoth master in the ~7 hours between: 20140517 15:08:48< irker317> wesnoth: Charles Dang wesnoth:master 6a4ac207730b / data/campaigns/An_Orcish_Incursion/scenarios/07_Showdown.cfg: AOI S7: removed redundant difficulty-conditional recruit list and 20140517 21:41:15< iceiceice> oh **** then you have bad refs. :-/ I can only suggest either that you use git format-patch to format any work since than as .patch files and recommit after resetting your history, or you might be able to use git-rebase to drop 6a4ac207730bef7c1ce5d02fbe0b0850b8322816 and 493f8d8fee1c0e748591ef827571dbd42a1bb9bc from your local repo, which should bring the histories into agreement. Very sorry about this, Chris Beck
_______________________________________________ Wesnoth-dev mailing list Wesnoth-dev@gna.org https://mail.gna.org/listinfo/wesnoth-dev
