lp:~z-man/armagetronad/armagetronad-unification-scripts
Created by
Manuel Moos
and last modified
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
Propose for merging
No branches
dependent on this one.
Branch information
Recent revisions
- 41. By Manuel Moos
-
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.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)