Re: [Openlp-core] [Merge] lp:~bennett-6/openlp/android2 into lp:openlp/android2
Marking as merged as the code is in the Release 7 version -- https://code.launchpad.net/~bennett-6/openlp/android2/+merge/337263 Your team OpenLP Core is subscribed to branch lp:openlp/android2. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bennett-6/openlp/android2 into lp:openlp/android2
Bennett, just an FYI, git is the only VCS that you need to do "-a" with to include all files. All other VCSes work the way Bazaar does (it is modeled on the convention, unlike git). -- https://code.launchpad.net/~bennett-6/openlp/android2/+merge/337263 Your team OpenLP Core is subscribed to branch lp:openlp/android2. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bennett-6/openlp/android2 into lp:openlp/android2
Can we close this merge proposal? Tim, is this merged now? -- https://code.launchpad.net/~bennett-6/openlp/android2/+merge/337263 Your team OpenLP Core is subscribed to branch lp:openlp/android2. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bennett-6/openlp/android2 into lp:openlp/android2
> The challenges are around android versions of libraries etc and not your code. > The code dropped in 100% fine, Yeah, I know. I referred to the equivalent of 'git commit -a' which I did and would never do with git. -- https://code.launchpad.net/~bennett-6/openlp/android2/+merge/337263 Your team OpenLP Core is subscribed to branch lp:openlp/android2. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bennett-6/openlp/android2 into lp:openlp/android2
The challenges are around android versions of libraries etc and not your code. The code dropped in 100% fine, -- https://code.launchpad.net/~bennett-6/openlp/android2/+merge/337263 Your team OpenLP Core is subscribed to branch lp:openlp/android2. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bennett-6/openlp/android2 into lp:openlp/android2
> but rejected. > This will not merge due to all the other changes in the file which are > different to the current release. > I have added your code to trunk and will do a test build this weekend on play > store. > Thanks for this it is appreciated. You're welcome, thanks for taking this! I know I did horrible things, I can't use bazaar and didn't have time to learn. I'm used to git. Maybe next time ;) -- https://code.launchpad.net/~bennett-6/openlp/android2/+merge/337263 Your team OpenLP Core is subscribed to branch lp:openlp/android2. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~bennett-6/openlp/android2 into lp:openlp/android2
Review: Approve but rejected. This will not merge due to all the other changes in the file which are different to the current release. I have added your code to trunk and will do a test build this weekend on play store. Thanks for this it is appreciated. -- https://code.launchpad.net/~bennett-6/openlp/android2/+merge/337263 Your team OpenLP Core is subscribed to branch lp:openlp/android2. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
