[Widelands-dev] [Merge] lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands

2015-06-02 Thread noreply
The proposal to merge lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~widelands-dev/widelands/tutorial-improvements/+merge/260656 -- Your team Widelands Developers is requ

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands

2015-06-02 Thread GunChleoc
Since the changes are small and current, there is no need to merge trunk into the branch first. So, this will do: $ cd ~/widelands-repo/trunk $ bzr pull (to get any recent changes to the main trunk) $ bzr merge ../bug-xxx $ bzr commit -m "Bug xxx fixed" $ bzr push lp:wideland

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands

2015-06-02 Thread TiborB
I prefer this method: https://wl.widelands.org/wiki/BzrPrimer/#alternative_method or somebody can do it for you :) -- https://code.launchpad.net/~widelands-dev/widelands/tutorial-improvements/+merge/260656 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands

2015-06-02 Thread wl-zocker
How do I do that? I've never merged to trunk before. -- https://code.launchpad.net/~widelands-dev/widelands/tutorial-improvements/+merge/260656 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands. ___

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands

2015-06-02 Thread GunChleoc
Review: Approve Please go ahead and merge :) -- https://code.launchpad.net/~widelands-dev/widelands/tutorial-improvements/+merge/260656 Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/tutorial-improvements into lp:widelands. __

Re: [Widelands-dev] [Merge] lp:~widelands-dev/widelands/authors into lp:widelands

2015-06-02 Thread TiborB
you are removing a lot of translator_credits/*.po files but there are only 2 translators/*.json files, why? update_authors.py is not ready for situation when json files would be corrupted, can this situation (corruption of json files) happen? -- https://code.launchpad.net/~widelands-dev/widelan