[elpa]: I possibly broke something

[elpa]: I possibly broke something

[David González Gándara]

[-- Attachment #1: Type: text/plain, Size: 177 bytes --]

I'm sorry about my unexpertise with git. I tried to merge my local changes
with the ones Stefan Monnier's did fixing my package and I think I may have
downgraded other changes.

[-- Attachment #2: Type: text/html, Size: 210 bytes --]

Re: [elpa]: I possibly broke something

[Michael Heerdegen]

David González Gándara <david.gonzalez.gandara@rai.usc.es> writes:

> I'm sorry about my unexpertise with git. I tried to merge my local
> changes with the ones Stefan Monnier's did fixing my package and I
> think I may have downgraded other changes.

What do you mean by "other changes"?  Changes unrelated to your package?


Michael.

Re: [elpa]: I possibly broke something

[mr_rookes]

>> I'm sorry about my unexpertise with git. I tried to merge my local 
>> changes with the ones Stefan Monnier's did fixing my package and I 
>> think I may have downgraded other changes.

>What do you mean by "other changes"? Changes unrelated to your package? Michael.

I don't know. I don't understand the output generated, but seems to be related with other packages. I just added, committed, pulled and pushed. At pulling, I was asked of merging my changes, and I thought I could only change the files in my git add.

Re: [elpa]: I possibly broke something

[Michael Heerdegen]

mr_rookes@yahoo.com writes:

> I don't know. I don't understand the output generated, but seems to be
> related with other packages.

What output?

Seems you are referring to the changes relative to the first parent
commit c523db of your merge commit.

The changes you were actually uploading with the merge are the changes
relative to the other parent commit of your merge, e565b5:

--8<---------------cut here---------------start------------->8---
1 file changed, 3 insertions(+), 3 deletions(-)
packages/transcribe/transcribe.el | 6 +++---

modified   packages/transcribe/transcribe.el
@@ -110,15 +110,15 @@
   " Transcribe"
   '(([?\C-x ?\C-p] . emms-play-file)
     ([?\C-x ?\C-a] . transcribe-analyze-episode)
-    ([?\C-x ?\C-n] . 'NewEpisode)
+    ([?\C-x ?\C-n] . NewEpisode)
     ([?\C-x down] . emms-stop)
     ([?\C-x right] . emms-seek-forward)
     ([?\C-x left] . emms-seek-backward)
     ([f5] . emms-pause)
     ([f6] . transcribe-define-xml-tag)
-    ([f7] . 'transcribe-xml-tag-l2-break)
+    ([f7] . transcribe-xml-tag-l2-break)
     ([f8] . emms-seek)
-    ([f4] . 'transcribe-set-atributes)
+    ([f4] . transcribe-set-atributes)
     ([f11] . transcribe-xml-tag-l1)
     ([f12] . transcribe-xml-tag-l2))
--8<---------------cut here---------------end--------------->8---

That looks sane.

> I just added, committed, pulled and pushed. At pulling, I was asked of
> merging my changes, and I thought I could only change the files in my
> git add.

I think you did it right.


Michael.

Re: [elpa]: I possibly broke something

[Artur Malabarba]

[-- Attachment #1: Type: text/plain, Size: 375 bytes --]

I'm looking at the latest diffs here and it looks like you didn't downgrade
anything.
On 2 Dec 2015 9:59 am, "David González Gándara" <
david.gonzalez.gandara@rai.usc.es> wrote:

> I'm sorry about my unexpertise with git. I tried to merge my local changes
> with the ones Stefan Monnier's did fixing my package and I think I may have
> downgraded other changes.
>

[-- Attachment #2: Type: text/html, Size: 658 bytes --]

Re: [elpa]: I possibly broke something

[Artur Malabarba]

2015-12-02 23:27 GMT+00:00 Artur Malabarba <bruce.connor.am@gmail.com>:
> I'm looking at the latest diffs here and it looks like you didn't downgrade
> anything.
>
> On 2 Dec 2015 9:59 am, "David González Gándara"
> <david.gonzalez.gandara@rai.usc.es> wrote:
>>
>> I'm sorry about my unexpertise with git. I tried to merge my local changes
>> with the ones Stefan Monnier's did fixing my package and I think I may have
>> downgraded other changes.

Just to ease your mind, David. I just checked git-blame and you most
certainly did not screw anything up. ;-)

Re: [elpa]: I possibly broke something

[David Kastrup]

Artur Malabarba <bruce.connor.am@gmail.com> writes:

> 2015-12-02 23:27 GMT+00:00 Artur Malabarba <bruce.connor.am@gmail.com>:
>> I'm looking at the latest diffs here and it looks like you didn't downgrade
>> anything.
>>
>> On 2 Dec 2015 9:59 am, "David González Gándara"
>> <david.gonzalez.gandara@rai.usc.es> wrote:
>>>
>>> I'm sorry about my unexpertise with git. I tried to merge my local changes
>>> with the ones Stefan Monnier's did fixing my package and I think I may have
>>> downgraded other changes.
>
> Just to ease your mind, David. I just checked git-blame and you most
> certainly did not screw anything up. ;-)

How would you check using git-blame that he did not accidentally revert
changes in a bad merge?  Neither the old nor the new lines would be
traced to him.

To check, you would rather use git-diff from before the merge on the
master branch to after the merge: that should only show his own work.

-- 
David Kastrup

Re: [elpa]: I possibly broke something

[Stefan Monnier]

> How would you check using git-blame that he did not accidentally revert
> changes in a bad merge?  Neither the old nor the new lines would be
> traced to him.

Indeed.  That's one of the many reasons why I much prefer vc-region-history
to vc-annotate.  I can't remember using vc-annotate since I added
vc-region-history, FWIW.


        Stefan

Re: [elpa]: I possibly broke something

[Artur Malabarba]

2015-12-03 17:44 GMT+00:00 David Kastrup <dak@gnu.org>:
> How would you check using git-blame that he did not accidentally revert
> changes in a bad merge?  Neither the old nor the new lines would be
> traced to him.

I had already checked (and stated) earlier that he didn't revert
anything (with the diffs). Now I just checked whether he had "taken
ownership" of any previous changes (with blame).

Re: [elpa]: I possibly broke something

[David Kastrup]

Artur Malabarba <bruce.connor.am@gmail.com> writes:

> 2015-12-03 17:44 GMT+00:00 David Kastrup <dak@gnu.org>:
>> How would you check using git-blame that he did not accidentally revert
>> changes in a bad merge?  Neither the old nor the new lines would be
>> traced to him.
>
> I had already checked (and stated) earlier that he didn't revert
> anything (with the diffs). Now I just checked whether he had "taken
> ownership" of any previous changes (with blame).

That's actually neigh impossible for a conflictless merge commit.  git
blame should not likely attribute anything to the committer of a merge
but manually resolved merge conflicts.

-- 
David Kastrup

Re: [elpa]: I possibly broke something

[David González Gándara]

[-- Attachment #1: Type: text/plain, Size: 857 bytes --]

Thanks for checking. I had never worked in git collaboratelly, I hope I get
used to it soon.

On 3 December 2015 at 21:20, David Kastrup <dak@gnu.org> wrote:

> Artur Malabarba <bruce.connor.am@gmail.com> writes:
>
> > 2015-12-03 17:44 GMT+00:00 David Kastrup <dak@gnu.org>:
> >> How would you check using git-blame that he did not accidentally revert
> >> changes in a bad merge?  Neither the old nor the new lines would be
> >> traced to him.
> >
> > I had already checked (and stated) earlier that he didn't revert
> > anything (with the diffs). Now I just checked whether he had "taken
> > ownership" of any previous changes (with blame).
>
> That's actually neigh impossible for a conflictless merge commit.  git
> blame should not likely attribute anything to the committer of a merge
> but manually resolved merge conflicts.
>
> --
> David Kastrup
>

[-- Attachment #2: Type: text/html, Size: 1449 bytes --]