Re: trunk r115910: Fix previous change

Re: trunk r115910: Fix previous change

[Glenn Morris]

Some of the things I fixed make me think this is still not a merge, but
rather a copying of one file on top of another. This is going to keep
causing problems every time.

PS Notice the Mail-Followup-To of emacs-diffs postings points to
emacs-devel.

Re: trunk r115910: Fix previous change

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> Some of the things I fixed make me think this is still not a merge, but
> rather a copying of one file on top of another. This is going to keep
> causing problems every time.

Yes, I'm still copying.  Sorry for those problems
and thanks for fixing them.

Too much work and no play makes me a dull boy :)

I never found the time to learn how to setup a proper
merge system, and with bzr being replaced soonish, I'll
wait until then to see how I can merge the clean way.

(If Org becomes a submodule, that'll be even easier.)

> PS Notice the Mail-Followup-To of emacs-diffs postings points to
> emacs-devel.

Noticed, thanks!

-- 
 Bastien

Re: trunk r115910: Fix previous change

[Stefan Monnier]

> I never found the time to learn how to setup a proper
> merge system, and with bzr being replaced soonish, I'll
> wait until then to see how I can merge the clean way.

It's easy: note down somewhere the Git revision of the last sync.
Then for a new sync do:

   git diff -r <lastsync> | (cd ..../emacs/lisp/org; patch)


-- Stefan

Re: trunk r115910: Fix previous change

[Bastien]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> I never found the time to learn how to setup a proper
>> merge system, and with bzr being replaced soonish, I'll
>> wait until then to see how I can merge the clean way.
>
> It's easy: note down somewhere the Git revision of the last sync.
> Then for a new sync do:
>
>    git diff -r <lastsync> | (cd ..../emacs/lisp/org; patch)

Noted, thanks,

-- 
 Bastien

Re: trunk r115910: Fix previous change

[Glenn Morris]

Bastien wrote:

>> It's easy: note down somewhere the Git revision of the last sync.
>> Then for a new sync do:
>>
>>    git diff -r <lastsync> | (cd ..../emacs/lisp/org; patch)
>
> Noted, thanks,

Come off it; this has been explained several times before and is hardly
rocket science. Eg:

http://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00648.html

This has been going on for ages.
I gave up making any non-essential change to Org years ago, because I
always had to make them twice.

Re: trunk r115910: Fix previous change

[Bastien]

Glenn Morris <rgm@gnu.org> writes:

> Bastien wrote:
>
>>> It's easy: note down somewhere the Git revision of the last sync.
>>> Then for a new sync do:
>>>
>>>    git diff -r <lastsync> | (cd ..../emacs/lisp/org; patch)
>>
>> Noted, thanks,
>
> Come off it; this has been explained several times before and is hardly
> rocket science. Eg:
>
> http://lists.gnu.org/archive/html/emacs-devel/2011-08/msg00648.html
>
> This has been going on for ages.

Indeed.  My bad.

If someone else wants to volunteer for this task, please speak up.

In the meantime, I'm thankful for the errors you patiently fix.

> I gave up making any non-essential change to Org years ago, because I
> always had to make them twice.

Backporting changes from Emacs Org to Org repo is boring too.
It seems easy enough to

~$ git clone git://orgmode.org/org-mode.git
~$ git checkout maint

and fix stuff there.

I think that's the way things work in general: prefer contributing
downstream instead of upstream.  If Org becomes a submodule, I hope
that Emacs core contributors will contribute to Org directly.

-- 
 Bastien

Re: trunk r115910: Fix previous change

[Andreas Schwab]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

> It's easy: note down somewhere the Git revision of the last sync.
> Then for a new sync do:
>
>    git diff -r <lastsync> | (cd ..../emacs/lisp/org; patch)

Better use git format-patch | git am.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."