[Libreoffice] [PATCH] Added line numbers to the basic ide

[August Sodora]

Ok, I've adjusted the patch to include the fix you provided
(thanks!!). I only have two more stumbling blocks at this point.
First, I don't have a account to commit with; would you mind creating
a branch for this in the meantime? Also, is there a consensus on how
the option to hide/display line numbers should be added? Currently I'm
trying to add a page to the options dialog in cui but I suppose it
will really only have one option for now, is that ok?

August Sodora
augsod at gmail.com
(201) 280-8138



On Fri, Nov 11, 2011 at 12:01 PM, Noel Power <nopower at suse.com> wrote:
> On 11/11/11 16:50, Noel Power wrote:
>>
>> On 11/11/11 16:30, August Sodora wrote:
>> I'd love to but I'm not exactly sure how. Currently I have it as a local
>> branch.
>>>
>> haha, yes, well not being much of a git guru myself I can't recall offhand
>> what the command are for that, let me try and find out what they are and get
>> back to you. Anyway, no problem with it being a local branch for the moment
>>
>> thanks,
>> Noel
>
> see below for some steps that kendy sent to the list at some stage, note the
> instructions are based on the old multi-repo setup so I guess one just needs
> to substitute 'git' for 'g' in the instructions below
>
>> So the example workflow might look like the following:
>>
>> # create the branch locally
>> g checkout -b mybranch
>> # develop something
>> ...
>> g commit -a
>> ...
>> g commit
>>
>> # find out that it might be useful as a feature branch
>> g -f push origin mybranch:feature/some-comprehensible-name
>> # continue development and pushing
>> ...
>> g commit -a
>> g push
>> # hmm, a conflict, somebody pushed to our
>> # feature/some-comprehensible-name branch, we want to get newest stuff
>> # from there.  In this case, we want the 'rebasing' pull.
>> g pull -r
>> g push
>>
>> # at some stage you might find out that you actually want to merge newer
>> # stuff from some other branch, eg. master
>> g merge master
>>
>> # finally you want to get it all back to master
>> g checkout master
>> g merge mybranch
>> g push
>> # if it failed, we need to get the newest stuff from the remote repo
>> # BUT WITHOUT REBASING
>> g pull --no-rebase
>> g push
>>
>> # everything finished, kill the remote branch
>> g -f push origin :feature/some-comphrehensible-name
>
> thanks again
>
> Noel
>
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Add-line-numbers-to-basic-ide.patch
Type: text/x-patch
Size: 7319 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/libreoffice/attachments/20111111/36d7c7cf/attachment-0001.bin>