Angband master branch reset on Github

Nick · October 27, 2014, 11:35

The facts were these.

After Angband 3.5 was released, the plan was to do a restructure of the codebase; to do this, I made a branch on Github called (unimaginatively) 'restruct'. The idea was that master should be left as it was until restruct was in a sensible state, so that people looking for the main codebase would find something useable.

Then a bit later I had some bugfixes for 3.5 submitted. The correct thing would have been to apply the bugfixes to the 3.5-release branch in preparation for a future bugfix release, and leave master so it could be just fast-forwarded with all the restruct code when the time came. Instead, I thought dimly "Right, bugfixes" and applied them to master.

So the least worst option seemed to me to be to apply the fixes to 3.5-release, and reset master back to the original 3.5 release point. At our devteam meeting last week, this was agreed to - and no-one even called me an idiot - so I have now done that. This is a long-winded way of saying

If you have code downstream of angband/angband master, I've just messed up your commit history. Sorry.

Nivim · October 27, 2014, 23:45

(Even though I don't know them, there are probably some fancy git commands to fix this; there usually are.)

Nick · October 28, 2014, 01:26

Yes, there are various strategies for people who did have downstream code. If anyone does and has difficulties, I'd be happy to help.

October 27, 2014, 11:35	#1
Nick Vanilla maintainer Join Date: Apr 2007 Location: Canberra, Australia Age: 55 Posts: 8,760 Donated: $60	Angband master branch reset on Github The facts were these. After Angband 3.5 was released, the plan was to do a restructure of the codebase; to do this, I made a branch on Github called (unimaginatively) 'restruct'. The idea was that master should be left as it was until restruct was in a sensible state, so that people looking for the main codebase would find something useable. Then a bit later I had some bugfixes for 3.5 submitted. The correct thing would have been to apply the bugfixes to the 3.5-release branch in preparation for a future bugfix release, and leave master so it could be just fast-forwarded with all the restruct code when the time came. Instead, I thought dimly "Right, bugfixes" and applied them to master. So the least worst option seemed to me to be to apply the fixes to 3.5-release, and reset master back to the original 3.5 release point. At our devteam meeting last week, this was agreed to - and no-one even called me an idiot - so I have now done that. This is a long-winded way of saying If you have code downstream of angband/angband master, I've just messed up your commit history. Sorry. __________________ One for the Dark Lord on his dark throne In the Land of Mordor where the Shadows lie.

October 28, 2014, 01:26	#3
Nick Vanilla maintainer Join Date: Apr 2007 Location: Canberra, Australia Age: 55 Posts: 8,760 Donated: $60	Yes, there are various strategies for people who did have downstream code. If anyone does and has difficulties, I'd be happy to help. __________________ One for the Dark Lord on his dark throne In the Land of Mordor where the Shadows lie.

Thread Tools
Show Printable Version Email this Page
Display Modes
Linear Mode Switch to Hybrid Mode Switch to Threaded Mode

Similar Threads
Thread	Thread Starter	Forum	Replies	Last Post
Getting Angband from Github and compiling it	Magnate	Development	121	December 17, 2019 03:57
Diablo II Ladder reset	dos350	Idle chatter	0	May 22, 2014 05:28
State of Angband master branch	d_m	Development	80	November 26, 2010 14:14
svn branch	Pete Mack	Vanilla	55	August 16, 2010 10:28
more fun with the development branch of 3.1.0	pesachyonah	Vanilla	6	May 17, 2008 17:13

October 27, 2014, 23:45	#2
Nivim Apprentice Join Date: Jan 2014 Location: Sufficient for living and internet. Posts: 69	(Even though I don't know them, there are probably some fancy git commands to fix this; there usually are.)

Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)