Doc-it patch: chapter 5 of Usage

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

Doc-it patch: chapter 5 of Usage

Federico Bruni-2
Hi,

please find attached a patch for italian documentation.
Thanks for checking and pushing it.

Cheers,
Federico

0001-Doc-it-add-Suggestions-chapter-of-Usage-plus-some-fi.patch (43K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: Doc-it patch: chapter 5 of Usage

Francisco Vila
2011/4/23 Federico Bruni <[hidden email]>:
> Hi,
>
> please find attached a patch for italian documentation.
> Thanks for checking and pushing it.

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


Reply | Threaded
Open this post in threaded view
|

Re: Doc-it patch: chapter 5 of Usage

Federico Bruni-2
Il giorno sab, 23/04/2011 alle 19.31 +0200, Francisco Vila ha scritto:
> 2011/4/23 Federico Bruni <[hidden email]>:
> > Hi,
> >
> > please find attached a patch for italian documentation.
> > Thanks for checking and pushing it.
>
> Done, thank you.

Thanks.

I have the same old question about Git.  Sorry, I still can't understand
what's happening.

After I made the commit my branch was ahead of origin by 1 commit.
It makes sense, it's ok.
Then you pushed my patch, I pull and I'm now ahead by 2 commits (there
is a merge commit).
What happened?

Why in my local copy my commit is duplicated (the same commit but
different committish)?  See:

$ git log
commit 08ac014434e6829cba0c184a31d96f1c9940b543
Merge: 12d6de0 192439e
Author: Federico Bruni <[hidden email]>
Date:   Sun Apr 24 09:57:06 2011 +0200

    Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
into lilypond/translation

commit 192439e23bf243634b52f77dd7b084cac7a8d48c
Author: Federico Bruni <[hidden email]>
Date:   Sat Apr 23 16:55:09 2011 +0200

    Doc-it: add Suggestions chapter of Usage (plus some fixes)

commit 12d6de0415aee9aa42c5e0fafaa94d064db63833
Author: Federico Bruni <[hidden email]>
Date:   Sat Apr 23 16:55:09 2011 +0200

    Doc-it: add Suggestions chapter of Usage (plus some fixes)

commit a96f9fb96e5a3dd0cdb0e421b78c6c94200b234a
Author: Francisco Vila <[hidden email]>


I know that I can fix it by reverting to
a96f9fb96e5a3dd0cdb0e421b78c6c94200b234a and pulling again.
But I'd like to first understand what happened.

git diff 12d6de0415aee9aa42c5e0fafaa94d064db63833
192439e23bf243634b52f77dd7b084cac7a8d48c

doesn't show anything, so why these duplicates?

Thanks,
Federico



Reply | Threaded
Open this post in threaded view
|

Re: Doc-it patch: chapter 5 of Usage

Francisco Vila
2011/4/24 Federico Bruni <[hidden email]>:
> I have the same old question about Git.  Sorry, I still can't understand
> what's happening.
>
> After I made the commit my branch was ahead of origin by 1 commit.
> It makes sense, it's ok.
> Then you pushed my patch, I pull and

What do you really expect to happen? You published a patch for other
to push it, the natural action now it's been pushed is to reset hard
to your previous commit.  You don't need that commit anymore and your
work is upstream, so why to keep you own version of it?

> I'm now ahead by 2 commits (there
> is a merge commit).
> What happened?

Your patch had a whitespace error, in one or another step the
whitespace could have been supressed and therefore the commit now
online is not exactly the same you did.  It comes to my mind as one
possibility.

> Why in my local copy my commit is duplicated (the same commit but
> different committish)?  See:
>
> $ git log
> commit 08ac014434e6829cba0c184a31d96f1c9940b543
> Merge: 12d6de0 192439e
> Author: Federico Bruni <[hidden email]>
> Date:   Sun Apr 24 09:57:06 2011 +0200
>
>    Merge branch 'lilypond/translation' of git://git.sv.gnu.org/lilypond
> into lilypond/translation
>
> commit 192439e23bf243634b52f77dd7b084cac7a8d48c
> Author: Federico Bruni <[hidden email]>
> Date:   Sat Apr 23 16:55:09 2011 +0200
>
>    Doc-it: add Suggestions chapter of Usage (plus some fixes)
>
> commit 12d6de0415aee9aa42c5e0fafaa94d064db63833
> Author: Federico Bruni <[hidden email]>
> Date:   Sat Apr 23 16:55:09 2011 +0200
>
>    Doc-it: add Suggestions chapter of Usage (plus some fixes)
>
> commit a96f9fb96e5a3dd0cdb0e421b78c6c94200b234a
> Author: Francisco Vila <[hidden email]>

>
> I know that I can fix it by reverting to
> a96f9fb96e5a3dd0cdb0e421b78c6c94200b234a and pulling again.
> But I'd like to first understand what happened.
>
> git diff 12d6de0415aee9aa42c5e0fafaa94d064db63833
> 192439e23bf243634b52f77dd7b084cac7a8d48c
>
> doesn't show anything, so why these duplicates?

I'd expect the whitespace to be shown here, but if you don't have any
output from diff, then I don't really have any ideas.

Maybe the commit is different because you are the author of both and I
am the committer of one of them.  The SHA ID of the commit is computed
from all and avery detail of the whole commit, not only its contents.
It's like a digital signature where you can not modify a single bit
and still expect the ID to be the same.
--
Francisco Vila. Badajoz (Spain)
www.paconet.org , www.csmbadajoz.com


Reply | Threaded
Open this post in threaded view
|

Re: Doc-it patch: chapter 5 of Usage

Federico Bruni-2
Il giorno dom, 24/04/2011 alle 19.28 +0200, Francisco Vila ha scritto:

> 2011/4/24 Federico Bruni <[hidden email]>:
> > I have the same old question about Git.  Sorry, I still can't understand
> > what's happening.
> >
> > After I made the commit my branch was ahead of origin by 1 commit.
> > It makes sense, it's ok.
> > Then you pushed my patch, I pull and
>
> What do you really expect to happen? You published a patch for other
> to push it, the natural action now it's been pushed is to reset hard
> to your previous commit.  You don't need that commit anymore and your
> work is upstream, so why to keep you own version of it?
>

I would expect that if my patch is clean (i.e. there is no error) and
you apply as it is, 'git pull' should be enough for my branch to be no
more ahead of origin by 1 commit.  No revert needed.
Because once my commit has been registered on the remote copy, my local
copy is identical to the remote copy.

But you say that the patch had a whitespace error, so nevermind.
In this case I run the strip-whitespace script only on the new file and
not on the updated files.  Next time I'll be more careful.

Thanks,
Federico