Redoing the import yielded the exact same state in git as before. According to
the git history, the "merged GUNs weak vtables change" deleted most files in
the repository, though of course it did not according to bzr.
I think this branch somehow triggered a bug in the git-bzr import script
I am investigating the weirdness with travis right now. Looking at GitHub [1],
the branch only contains partial data and claims to have deleted 37.000 files.
Looking at the bzr diff between trunk and this branch shows a smaller diff - so
my guess is that bunnybot did not do a good job importing
Testing hint:
use this datadir this will use the functions
https://code.launchpad.net/~widelands-dev/widelands/reveal_hide_animations,
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721
Your team Widelands Developers is subscribed to branch
Review: Approve testing
Opened all menus and all looks good to me :-)
--
https://code.launchpad.net/~widelands-dev/widelands/savegame-menu/+merge/322924
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/savegame-menu.
Review: Approve code review
Code Revire is ok for me.
In case of an error some layout may be broken, well. We will find that.
--
https://code.launchpad.net/~widelands-dev/widelands/fh1-winconditions/+merge/323987
Your team Widelands Developers is subscribed to branch
The proposal to merge lp:~widelands-dev/widelands/b19_gcc7 into
lp:widelands/build19 has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/b19_gcc7/+merge/325798
--
Your team Widelands Developers is requested to review
The proposal to merge lp:~widelands-dev/widelands/switch_direction into
lp:widelands has been updated.
Status: Needs review => Rejected
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/switch_direction/+merge/315432
--
Your team Widelands Developers is subscribed
Yes, let's skip this. The chance of actually changing direction are low, and if
it should end up bothering us after all, we can always reopen the issue.
--
https://code.launchpad.net/~widelands-dev/widelands/switch_direction/+merge/315432
Your team Widelands Developers is subscribed to branch
What is the status of this?
In my mind there is no need to change the current behavior from trunk. My
arguments are stated here:
https://bugs.launchpad.net/widelands/+bug/1658533/comments/6
--
https://code.launchpad.net/~widelands-dev/widelands/switch_direction/+merge/315432
Your team
Review: Approve testing
I think this is working now :-)
--
https://code.launchpad.net/~widelands-dev/widelands/bug-1687100-reveal_fields/+merge/323721
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug-1687100-reveal_fields.
The proposal to merge lp:~widelands-dev/widelands/ai_trainingsites_proportion
into lp:widelands has been updated.
Status: Needs review => Merged
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai_trainingsites_proportion/+merge/324607
--
Your team Widelands
11 matches
Mail list logo
