Web-it update patch

classic Classic list List threaded Threaded
17 messages Options
Reply | Threaded
Open this post in threaded view
|

Web-it update patch

Federico Bruni-2
Hi,

can anyone please check the attached patch?

Thanks!

Federico

0001-Web-it-update-italian-translation-of-website.patch (43K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

John Mandereau
Hi Federico,
Il giorno dom, 21/11/2010 alle 20.32 +0100, Federico Bruni ha scritto:
> can anyone please check the attached patch?
>
> Thanks!
>
> Federico

Applied (I fixed a trailing white space).

From Documentation/web/manuals.it.html the link to Essay is broken, but
that's unrelated to your patch and not your job; I'm struggling with the
crazy combination of Texinfo macros and html links rewrite by Python
scripts.

Best,
John

signature.asc (205 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Federico Bruni-2
Il giorno dom, 21/11/2010 alle 23.02 +0100, John Mandereau ha scritto:

> Hi Federico,
> Il giorno dom, 21/11/2010 alle 20.32 +0100, Federico Bruni ha scritto:
> > can anyone please check the attached patch?
> >
> > Thanks!
> >
> > Federico
>
> Applied (I fixed a trailing white space).
>

Thanks.

Last question: I tried to pull and saw the conflict in
it/web/community.itexi.
I've fixed my file, then 'git add file' and 'git commit -a'.
It seems fine, but this output is OK?

fede@debian:~/lilypond-git$ git status
# On branch lilypond/translation
# Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
#
nothing to commit (working directory clean)

My branch is ahead of origin by 2 commits... What does it mean?
Is it normal?


> From Documentation/web/manuals.it.html the link to Essay is broken, but
> that's unrelated to your patch and not your job; I'm struggling with the
> crazy combination of Texinfo macros and html links rewrite by Python
> scripts.
>

Ok, noted.
Good luck! :)



Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Francisco Vila
2010/11/22 Federico Bruni <[hidden email]>:

> Last question: I tried to pull and saw the conflict in
> it/web/community.itexi.
> I've fixed my file, then 'git add file' and 'git commit -a'.
> It seems fine, but this output is OK?
>
> fede@debian:~/lilypond-git$ git status
> # On branch lilypond/translation
> # Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
> #
> nothing to commit (working directory clean)
>
> My branch is ahead of origin by 2 commits... What does it mean?
> Is it normal?


What's your output from

  git diff origin/lilypond/translation

?

You didn't push your commits yet, probably that's why your branch is ahead

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

John Mandereau
In reply to this post by Federico Bruni-2
Il giorno lun, 22/11/2010 alle 08.47 +0100, Federico Bruni ha scritto:

> Last question: I tried to pull and saw the conflict in
> it/web/community.itexi.
> I've fixed my file, then 'git add file' and 'git commit -a'.
> It seems fine, but this output is OK?
>
> fede@debian:~/lilypond-git$ git status
> # On branch lilypond/translation
> # Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
> #
> nothing to commit (working directory clean)
>
> My branch is ahead of origin by 2 commits... What does it mean?
> Is it normal?
Could you send the output of first three commits from "git log -p"? This
will give more precise information than what Francisco requested.


signature.asc (205 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Francisco Vila
2010/11/22 John Mandereau <[hidden email]>:

> Il giorno lun, 22/11/2010 alle 08.47 +0100, Federico Bruni ha scritto:
>> Last question: I tried to pull and saw the conflict in
>> it/web/community.itexi.
>> I've fixed my file, then 'git add file' and 'git commit -a'.
>> It seems fine, but this output is OK?
>>
>> fede@debian:~/lilypond-git$ git status
>> # On branch lilypond/translation
>> # Your branch is ahead of 'origin/lilypond/translation' by 2 commits.
>> #
>> nothing to commit (working directory clean)
>>
>> My branch is ahead of origin by 2 commits... What does it mean?
>> Is it normal?
>
> Could you send the output of first three commits from "git log -p"? This
> will give more precise information than what Francisco requested.

True and not true. 'git log -p' gives a detailed log in patch form,
but IMO (if an opinion is possible here at all) 'git diff origin'
shows how your branch differs from origin, which 'git log' doesn't.  I
could be wrong, but Federico asked about the fact that his branch was
ahead of origin by two commits.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

John Mandereau
Il giorno lun, 22/11/2010 alle 11.12 +0100, Francisco Vila ha scritto:
> True and not true. 'git log -p' gives a detailed log in patch form,
> but IMO (if an opinion is possible here at all) 'git diff origin'
> shows how your branch differs from origin, which 'git log' doesn't.  I
> could be wrong, but Federico asked about the fact that his branch was
> ahead of origin by two commits.

Oops, my bad.  I guess one of these two commits is the merge commit, the
other one the commit that originated the patch he sent, and the three
last commits given by "git log -p" might not include the former, in case
it displays those from origin/lilypond/translation first, so you were
right to ask diff output.  Federico, could you send both outputs that
Francisco and I requested, please?

Cheers,
John

signature.asc (205 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Federico Bruni-2
2010/11/22 John Mandereau <[hidden email]>
Il giorno lun, 22/11/2010 alle 11.12 +0100, Francisco Vila ha scritto:
> True and not true. 'git log -p' gives a detailed log in patch form,
> but IMO (if an opinion is possible here at all) 'git diff origin'
> shows how your branch differs from origin, which 'git log' doesn't.  I
> could be wrong, but Federico asked about the fact that his branch was
> ahead of origin by two commits.

Oops, my bad.  I guess one of these two commits is the merge commit, the
other one the commit that originated the patch he sent, and the three
last commits given by "git log -p" might not include the former, in case
it displays those from origin/lilypond/translation first, so you were
right to ask diff output.  Federico, could you send both outputs that
Francisco and I requested, please?


I'll send them in the late evening, when I'm back home.
Anyway, I didn't push my commits... I should have run 'git push' before 'git pull'?

See you later
Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

John Mandereau
Il giorno lun, 22/11/2010 alle 16.02 +0100, Federico Bruni ha scritto:


> I'll send them in the late evening, when I'm back home.
> Anyway, I didn't push my commits... I should have run 'git push'
> before 'git pull'?

In case you haven't committed newer stuff, you shouldn't push but rebase
so it eliminates some history which is duplicate up to trailing
whitespace.  We'll see this tonight.

Cheers,
John

signature.asc (205 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Federico Bruni-2
In reply to this post by John Mandereau
Il giorno lun, 22/11/2010 alle 15.25 +0100, John Mandereau ha scritto:

> Il giorno lun, 22/11/2010 alle 11.12 +0100, Francisco Vila ha scritto:
> > True and not true. 'git log -p' gives a detailed log in patch form,
> > but IMO (if an opinion is possible here at all) 'git diff origin'
> > shows how your branch differs from origin, which 'git log' doesn't.  I
> > could be wrong, but Federico asked about the fact that his branch was
> > ahead of origin by two commits.
>
> Oops, my bad.  I guess one of these two commits is the merge commit, the
> other one the commit that originated the patch he sent, and the three
> last commits given by "git log -p" might not include the former, in case
> it displays those from origin/lilypond/translation first, so you were
> right to ask diff output.  Federico, could you send both outputs that
> Francisco and I requested, please?
>

git diff origin/lilypond/translation gives no output

three last commits given by 'git log -p':


commit 9fd0d13c081d482922dbc5eb4747cde6bd965ea7
Merge: 4ad45c8 92190ad
Author: Federico Bruni <[hidden email]>
Date:   Mon Nov 22 08:38:14 2010 +0100

    Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
into li
   
    Conflicts:
        Documentation/it/web/community.itexi

commit 92190ad98deac78cf32837078741296205072119
Author: John Mandereau <[hidden email]>
Date:   Sun Nov 21 22:48:49 2010 +0100

    Docs-de: update syntax with convert-ly to fix doc build

commit 69068a797fa36f51f487c62754729a82d5e8bb99
Author: Federico Bruni <[hidden email]>
Date:   Sun Nov 21 20:28:41 2010 +0100

    Web-it: update italian translation of website




Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Francisco Vila
2010/11/22 Federico Bruni <[hidden email]>:

> git diff origin/lilypond/translation gives no output

This would mean that your tree is in sync with origin; to my understanding only.

> three last commits given by 'git log -p':

> commit 9fd0d13c081d482922dbc5eb4747cde6bd965ea7
> Merge: 4ad45c8 92190ad
> Author: Federico Bruni <[hidden email]>
> Date:   Mon Nov 22 08:38:14 2010 +0100
>
>    Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
> into li
>
>    Conflicts:
>        Documentation/it/web/community.itexi

This is new and it is currently not in origin.

> commit 92190ad98deac78cf32837078741296205072119
> Author: John Mandereau <[hidden email]>
> Date:   Sun Nov 21 22:48:49 2010 +0100
>
>    Docs-de: update syntax with convert-ly to fix doc build
>
> commit 69068a797fa36f51f487c62754729a82d5e8bb99
> Author: Federico Bruni <[hidden email]>
> Date:   Sun Nov 21 20:28:41 2010 +0100
>
>    Web-it: update italian translation of website

These two are actually in origin.  I think you can safely push, but
let's see what John says.

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

John Mandereau
Il giorno lun, 22/11/2010 alle 19.57 +0100, Francisco Vila ha scritto:
> 2010/11/22 Federico Bruni <[hidden email]>:
> > git diff origin/lilypond/translation gives no output
>
> This would mean that your tree is in sync with origin; to my understanding only.

In the viewpoint of content, yes, it's just that his branch has some
redundant information (we're not interested in merging history that only
deals with whitespace).


> These two are actually in origin.  I think you can safely push, but
> let's see what John says.

No, pushing would just throw in redundant history (authorship would be
identical as well), best is to

git reset --hard origin/lilypond/translation

In this case, it is safe, but please always check with a diff to
origin/lilypond/translation (as we did in this thread) to check that you
do not lose anything.

Best,
John

signature.asc (205 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Federico Bruni-2
Il giorno mar, 23/11/2010 alle 10.02 +0100, John Mandereau ha scritto:

> No, pushing would just throw in redundant history (authorship would be
> identical as well), best is to
>
> git reset --hard origin/lilypond/translation
>
> In this case, it is safe, but please always check with a diff to
> origin/lilypond/translation (as we did in this thread) to check that you
> do not lose anything.
>

Ok, I've done it. Now it's ok.

I wonder what should I do if something similar will happen again. I
mean, if you fix some error in my patch and then you apply it (this is
quite likely to happen, even though from now on I'll try at least to fix
trailing spaces before sending the patch).

I guess I should rebase if I haven't done any change to my local copy
after sending the patch (otherwise I'll lose my work).
Right? (this is my understanding of what you wrote below)

Il giorno lun, 22/11/2010 alle 16.20 +0100, John Mandereau ha scritto:
> Il giorno lun, 22/11/2010 alle 16.02 +0100, Federico Bruni ha scritto:
>
>
> > I'll send them in the late evening, when I'm back home.
> > Anyway, I didn't push my commits... I should have run 'git push'
> > before 'git pull'?
>
> In case you haven't committed newer stuff, you shouldn't push but
rebase
> so it eliminates some history which is duplicate up to trailing
> whitespace.  We'll see this tonight.


If I have commited new stuff, I guess I should merge "in a clean way".
Well, we'll see it when/if it happens :)

Cheers,
Federico

PS What do you recommend to trim trailing spaces?
I've found this Gedit plugin, trailsave (no longer maintained):
http://users.tkk.fi/~otsaloma/gedit/ 

I may give it a try..
I've read also about a git configuration...

Please let me know what yuo use.
Thanks!



Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Francisco Vila
2010/11/23 Federico Bruni <[hidden email]>:
> PS What do you recommend to trim trailing spaces?
> Please let me know what yuo use.

I use

#!/bin/sh
sed -i 's/[ \t]*$//g' $1

--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

John Mandereau
In reply to this post by Federico Bruni-2
Il giorno mar, 23/11/2010 alle 20.30 +0100, Federico Bruni ha scritto:
> Ok, I've done it. Now it's ok.

Great!


> I wonder what should I do if something similar will happen again. I
> mean, if you fix some error in my patch and then you apply it (this is
> quite likely to happen, even though from now on I'll try at least to fix
> trailing spaces before sending the patch).
>
> I guess I should rebase if I haven't done any change to my local copy
> after sending the patch (otherwise I'll lose my work).
> Right? (this is my understanding of what you wrote below)

Exactly.  I'm happy that you understood a bit more of Git.

Cheers,
John



Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Jean-Charles MALAHIEUDE
In reply to this post by Francisco Vila
Le 23/11/2010 20:46, Francisco Vila disait :
> 2010/11/23 Federico Bruni:
>> PS What do you recommend to trim trailing spaces?
>> Please let me know what you use.
>
> I use
>
> #!/bin/sh
> sed -i 's/[ \t]*$//g' $1
>

I personally use, before committing

scripts/auxiliar/strip-whitespace.py Documentation/fr/THEFILE

Cheers,
Jean-Charles


Reply | Threaded
Open this post in threaded view
|

Re: Web-it update patch

Till Paala
Am 24.11.10 20:48, schrieb Jean-Charles Malahieude:
>
>
> I personally use, before committing
>
> scripts/auxiliar/strip-whitespace.py Documentation/fr/THEFILE
that was a good hint, thanks!

Till
>
> Cheers,
> Jean-Charles
>
>
>