Branch: gabba_ghosted_units Created: Gabriel Morin <[email protected]> 2010-05-01 00:01:54 Last commit: Gabriel Morin <[email protected]> 2010-05-03 19:50:08 Question: Was this merged to trunk? If so, at what commit?
Can't remember the details, I believe this was merged manually with trunk (i.e. not using svn's merge feature). Either way it can be deleted. 2013/3/1 Eric S. Raymond <[email protected]>: > As the last major step in readying the git repo, I'm trying to > find out whether various development branches were merged or > cherry-picked back to trunk, and if so when this happened > for each one. > > I will express this by creating merge links in gitspace. These will > be important clues for anyone reading the history. > > Here are the branches at issue: > > Branch: 1_2. > Created: 2006-10-13 16:38:01 by Jörg Hinrichs <[email protected]> > Last commit: 2006-10-17 15:39:38 by Jörg Hinrichs <[email protected]> > Question: Was this branch merged back to 1.2? If so, at what commit? > > Branch: asio_wesnothd > Created: 2011-12-30 08:43:14 by Sergey Popov <[email protected]> > Last commit: 2012-04-30 20:07:18 by Sergey Popov <[email protected]> > Question: was this branch ever merged back to trunk? If so, at what commit? > > Branch: branch_gettext1 > Created: 2004-06-21 16:44:20 by Yann Dirson <[email protected]> > Last commit: 2004-08-15 11:32:44 by Yann Dirson <[email protected]> > Question: When was this merged or cherry-picked back to trunk? > > Branch: dfool_terrain > Created and last commit: 2006-04-27 19:34:40 by John W. C. McNabb > <[email protected]> > Question: Did this go anywhere? Should it be deleted? > > Branch: editor > Created: Fabian Müller <[email protected]> 2011-03-10 21:27:23 > Last commit: abian Müller <[email protected]> 2011-04-18 11:12:56 > Question: Was this merged to trunk? If so, at what revision? > > Branch: fendrin_pathfind_and_editor > Question: I'm confused about the history of this branch and how it > relates to 'editor'. > > Branch: formula_ai > Created: David White <[email protected]> 2008-01-27 22:04:25 > Last commit: Bartek Waresiak <[email protected]> 2008-03-02 14:57:40 > Question: Was this merged to trunk? If so, at what commit? > > Branch: gabba_ghosted_units > Created: Gabriel Morin <[email protected]> 2010-05-01 00:01:54 > Last commit: Gabriel Morin <[email protected]> 2010-05-03 19:50:08 > Question: Was this merged to trunk? If so, at what commit? > > Branch: mp_registration > Created: Thomas Baumhauer <[email protected]> 2008-03-17 16:42:30 > Last commit: Thomas Baumhauer <[email protected]> 2008-03-24 05:44:47 > Question: Was this merged to trunk? If so, at what commit? > > Branch: new_addon_server > Created: Tomasz Śniatowski <[email protected]> 2010-09-19 07:24:03 > Last commit: Tomasz Śniatowski <[email protected]> 2010-10-16 13:58:08 > Question: Was this merged to trunk? If so, at what commit? > > Branch: ogl > Created: Ali El Gariani <[email protected]> 2010-09-28 18:14:21 > Last commit: Alexander van Gessel <[email protected]> 2010-11-19 13:07:05 > Question: Was this merged to trunk? If so, at what commit? > > Branch: terrain-layer > Created: Moritz Göbelbecker <[email protected]> 2007-03-07 15:19:52 > Last commit: Mark de Wever <[email protected]> 2007-04-12 13:35:25 > Question: Was this merged to trunk? If so, at what commit? > > Branch: umcmg > Created: Ignacio R. Morelle <[email protected]> 2010-10-20 20:36:20 > Last commit: Ignacio R. Morelle <[email protected]> > Question: Was this merged to trunk? If so, at what commit? > > Branch: upthorn_persistence > Created: Iurii Chernyi <[email protected]> 2010-04-17 06:26:47 > Last commit: Jody Northup <[email protected]> 2010-04-19 06:21:14 > Question: Was this merged to trunk? If so, at what commit? > > -- > <a href="http://www.catb.org/~esr/";>Eric S. Raymond</a> > > [W]hat country can preserve its liberties, if its rulers are not > warned from time to time that [the] people preserve the spirit of > resistance? Let them take arms...The tree of liberty must be > refreshed from time to time, with the blood of patriots and tyrants. > -- Thomas Jefferson, letter to Col. William S. Smith, 1787 _______________________________________________ Wesnoth-dev mailing list [email protected] https://mail.gna.org/listinfo/wesnoth-dev
