1.)(the line errors) which files is this in
2.) how do i pull the trunk changes into my branch in my comp
The dirs are:
C:\Python27\Projects\Openlp\trunk
C:\Python27\Projects\Openlp\milleja46
I'll make the appropiate changes once i get home
On Tue, May 24, 2011 at 11:05 AM, Jonathan Corwin <[email protected]> wrote:
> Review: Needs Fixing
> You've changed all the line endings to Windows. They need to be Unix.
> I emailed you with information on how to change your Eric settings, and you
> need to then make a change in each file, and save it, and Eric should
> automatically change the line endings back.
>
> Note, line numbers below refer to the line number of the diff at
> https://code.launchpad.net/~milleja46/openlp/milleja46/+merge/62141
>
> Line 8, remove the extra blank line you removed.
> Line 492,493,494, enableLoopCheckbox -> enableLoopCheckBox (capital B like
> the others)
> Line 618, 'enable slide loop'. Perhaps a nicer label on the dialog? I don't
> have v1.2 in front of me, but I suggest the same label, whatever it was.
> Line 668, you changed True to False. Change it back.
> Line 1724 and 1744: You need a blank line before the def. (I already told you
> this)
> Line 1728 and 1748: You don't need to create a loopcheck variable, on line
> 1738 and 1758 you can just get the QSetting directly there, as it is only
> used the once.
> Also the maximum line length is 80 characters, so you will need to wrap the
> QSetting line at a suitable point.
>
> Finally you need to update trunk, and merge these changes into your milleja46
> branch and resolve any conflicts.
> --
> https://code.launchpad.net/~milleja46/openlp/milleja46/+merge/62141
> You are the owner of lp:~milleja46/openlp/milleja46.
>
--
https://code.launchpad.net/~milleja46/openlp/milleja46/+merge/62141
Your team OpenLP Core is subscribed to branch lp:openlp.
_______________________________________________
Mailing list: https://launchpad.net/~openlp-core
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openlp-core
More help : https://help.launchpad.net/ListHelp
