Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands
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 that we use for bunnybot. I cannot fathom how we got into this state. I am unsure what happens if we merge this branch into trunk - maybe this breaks bunnybot for everything going forward or maybe it fixes it. My suggestion is the following: apply the diff of this branch onto trunk in a new branch, close the current one as abandoned and continue on the other one. Of course this looses the history of this branch, but content trumps IMHO. -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017/+merge/325717 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_062017. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/compiler_warnings_062017 into lp:widelands
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 all of this branch. I am nuking bunnybots knowledge of this pull request and let it retry. Sorry for the inconvenience. [1] https://github.com/widelands/widelands/tree/_widelands_dev_widelands_compiler_warnings_062017 -- https://code.launchpad.net/~widelands-dev/widelands/compiler_warnings_062017/+merge/325717 Your team Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/compiler_warnings_062017. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands
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 lp:~widelands-dev/widelands/bug-1687100-reveal_fields. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/savegame-menu into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/fh1-winconditions into lp:widelands
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 lp:~widelands-dev/widelands/fh1-winconditions. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/b19_gcc7 into lp:widelands/build19
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 proposed merge of lp:~widelands-dev/widelands/b19_gcc7 into lp:widelands/build19. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/switch_direction into lp:widelands
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 to branch lp:~widelands-dev/widelands/switch_direction. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/switch_direction into lp:widelands
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 lp:~widelands-dev/widelands/switch_direction. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/switch_direction into lp:widelands
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 Widelands Developers is subscribed to branch lp:~widelands-dev/widelands/switch_direction. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/bug-1687100-reveal_fields into lp:widelands
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. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~widelands-dev/widelands/ai_trainingsites_proportion into lp:widelands
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 Developers is subscribed to branch lp:~widelands-dev/widelands/ai_trainingsites_proportion. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
