Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi Lionel,

Thanks very much. Sorry for not doing it myself, my wife's been using
the computer too much :-) And I've been working this morning, I was
hoping to look at it this afternoon - Tor kindly told me how to squash
patches, but I hadn't had a chance to do it.

Hopefully all new work is going to be on a dev system that my wife won't
use :-)

Cheers,
Wol

On 29/04/13 09:22, Lionel Elie Mamane wrote:
Hi Anthony,

Thank you for submitting your change through gerrit. I've pushed it to
master. On gerrit, Tor asked you to please combine all three changes
into one; the main reason is that these changes are not "meaningful"
changes by themselves, but the latter two are really "fixes" to the
first one. It is thus cleaner to "squash" the changes into one.

I did the "squash" of the three changes into one. Here's how to do it:

1) I cherry-picked your changes (since you already have these changes
   in your local tree, you wouldn't have needed to do that):

user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch git://gerrit.libreoffice.org/core 
refs/changes/14/3614/1 && git cherry-pick FETCH_HEAD
remote: Counting objects: 13, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 6), reused 1 (delta 0)
Unpacking objects: 100% (7/7), done.
From git://gerrit.libreoffice.org/core
 * branch            refs/changes/14/3614/1 -> FETCH_HEAD
[master 112e852] Rewrite as a static table of keywords and loop over these keywords
 Author: Wol <anthony@youngman.org.uk>
 1 file changed, 25 insertions(+), 33 deletions(-)
user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch git://gerrit.libreoffice.org/core 
refs/changes/15/3615/1 && git cherry-pick FETCH_HEAD
remote: Counting objects: 20, done.
remote: Compressing objects: 100% (12/12), done.
remote: Total 14 (delta 12), reused 4 (delta 2)
Unpacking objects: 100% (14/14), done.
From git://gerrit.libreoffice.org/core
 * branch            refs/changes/15/3615/1 -> FETCH_HEAD
[master b997307] Rewrite as a static table of keywords and loop over them
 Author: Wol <anthony@youngman.org.uk>
 1 file changed, 3 insertions(+), 2 deletions(-)
user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git fetch git://gerrit.libreoffice.org/core 
refs/changes/16/3616/1 && git cherry-pick FETCH_HEAD
remote: Counting objects: 27, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 21 (delta 17), reused 17 (delta 13)
Unpacking objects: 100% (21/21), done.
From git://gerrit.libreoffice.org/core
 * branch            refs/changes/16/3616/1 -> FETCH_HEAD
[master fa8cf51] Change j type to size_t
 Author: Wol <anthony@youngman.org.uk>
 1 file changed, 1 insertion(+), 3 deletions(-)


2) Squash them into one:

user@host:~/src/libreoffice/workdirs/libreoffice-4.1$ git rebase --interactive
# I then get in my editor:
#  pick 112e852 Rewrite as a static table of keywords and loop over these keywords
#  pick b997307 Rewrite as a static table of keywords and loop over them
#  pick fa8cf51 Change j type to size_t
# I change it to:
#  pick 112e852 Rewrite as a static table of keywords and loop over these keywords
#  squash b997307 Rewrite as a static table of keywords and loop over them
#  squash fa8cf51 Change j type to size_t
# and then close my editor
#  git proceeds and opens my editor again, with the concatenation of
#  all three commit messages. I edit it to make one "good" commit
#  message that covers everything and contains no temporary notes like
#  "does not compile yet":
# I kept the "Change-Id" of the first change.
# close my editor again
# And I'm done!

3) test

4) push / submit to gerrit

5) congratulate Wols for successful patch! ;-)

Thanks for the patch!

On Fri, Apr 26, 2013 at 08:20:49AM +0000, Anthony Youngman (via Code Review) wrote:

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3614

Rewrite as a static table of keywords and loop over these keywords

It currently contains a compile error - the call the matchIgnoreAsciiCaseAsciiL
fails.

On Fri, Apr 26, 2013 at 08:20:52AM +0000, Anthony Youngman (via Code Review) wrote:

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3615

Rewrite as a static table of keywords and loop over them
On Fri, Apr 26, 2013 at 08:20:54AM +0000, Anthony Youngman (via Code Review) wrote:

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3616

Change j type to size_t



Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.