lp:~z-man/armagetronad/armagetronad-unification-scripts

Created by Manuel Moos on 2015-09-19 and last modified on 2019-01-05

Scripts for unifying 0.4 and 0.28 bzr branches so that merges can happen in bzr.

Winlibs 0.4 history gets collapsed, we do not need it in full.

A couple of 0.4 revisions get modified:
- the utf8 merge is broken and needed repairs
- the zone rendering change removed and added files, killing merges
- the sdl2 merge, when re-imported, is missing a configuration file

Get this branch:
bzr branch lp:~z-man/armagetronad/armagetronad-unification-scripts
Only Manuel Moos can upload to this branch. If you are Manuel Moos please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Manuel Moos
Project:
Armagetron Advanced
Status:
Experimental

Recent revisions

41. By Manuel Moos on 2019-01-05

Activating push to lp. Results look good, history in bzr is
(effectively) identical down to the borked utf8 merge, result merges
with master when imorted into git.

40. By Manuel Moos on 2019-01-05

Starting final export earilier.

39. By Manuel Moos on 2019-01-05

With the new cleanup, the old branch name is fine.

38. By Manuel Moos on 2019-01-05

Cleaner repair process.

37. By Manuel Moos on 2019-01-03

Disabling cmake branch, does not work :(

36. By Manuel Moos on 2019-01-03

Renamed target branch, we need to postprocess it.

35. By Manuel Moos on 2019-01-03

Added script to treat our unmerged branches.

34. By Manuel Moos on 2019-01-02

Forgot to save...

33. By Manuel Moos on 2019-01-02

Enabling all hack branches.

32. By Manuel Moos on 2019-01-02

Enabling push of result to lp.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers