* Re: trunk r115910: Fix previous change
[not found] ` <87k3ebg1p7.fsf@bzg.ath.cx>
@ 2014-01-07 17:15 ` Glenn Morris
2014-01-07 17:19 ` Bastien
0 siblings, 1 reply; 7+ messages in thread
From: Glenn Morris @ 2014-01-07 17:15 UTC (permalink / raw)
To: Bastien; +Cc: emacs-devel
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.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: trunk r115910: Fix previous change
2014-01-07 17:15 ` trunk r115910: Fix previous change Glenn Morris
@ 2014-01-07 17:19 ` Bastien
2014-01-08 3:07 ` Stefan Monnier
0 siblings, 1 reply; 7+ messages in thread
From: Bastien @ 2014-01-07 17:19 UTC (permalink / raw)
To: Glenn Morris; +Cc: emacs-devel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: trunk r115910: Fix previous change
2014-01-07 17:19 ` Bastien
@ 2014-01-08 3:07 ` Stefan Monnier
2014-01-08 7:24 ` Bastien
2014-01-08 8:41 ` Andreas Schwab
0 siblings, 2 replies; 7+ messages in thread
From: Stefan Monnier @ 2014-01-08 3:07 UTC (permalink / raw)
To: Bastien; +Cc: emacs-devel
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: trunk r115910: Fix previous change
2014-01-08 3:07 ` Stefan Monnier
@ 2014-01-08 7:24 ` Bastien
2014-01-08 7:40 ` Glenn Morris
2014-01-08 8:41 ` Andreas Schwab
1 sibling, 1 reply; 7+ messages in thread
From: Bastien @ 2014-01-08 7:24 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: trunk r115910: Fix previous change
2014-01-08 7:24 ` Bastien
@ 2014-01-08 7:40 ` Glenn Morris
2014-01-08 8:44 ` Bastien
0 siblings, 1 reply; 7+ messages in thread
From: Glenn Morris @ 2014-01-08 7:40 UTC (permalink / raw)
To: Bastien; +Cc: Stefan Monnier, emacs-devel
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: trunk r115910: Fix previous change
2014-01-08 7:40 ` Glenn Morris
@ 2014-01-08 8:44 ` Bastien
0 siblings, 0 replies; 7+ messages in thread
From: Bastien @ 2014-01-08 8:44 UTC (permalink / raw)
To: Glenn Morris; +Cc: Stefan Monnier, emacs-devel
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: trunk r115910: Fix previous change
2014-01-08 3:07 ` Stefan Monnier
2014-01-08 7:24 ` Bastien
@ 2014-01-08 8:41 ` Andreas Schwab
1 sibling, 0 replies; 7+ messages in thread
From: Andreas Schwab @ 2014-01-08 8:41 UTC (permalink / raw)
To: Stefan Monnier; +Cc: Bastien, emacs-devel
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."
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-01-08 8:44 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <E1W0a03-0005VY-IQ@vcs.savannah.gnu.org>
[not found] ` <87k3ebg1p7.fsf@bzg.ath.cx>
2014-01-07 17:15 ` trunk r115910: Fix previous change Glenn Morris
2014-01-07 17:19 ` Bastien
2014-01-08 3:07 ` Stefan Monnier
2014-01-08 7:24 ` Bastien
2014-01-08 7:40 ` Glenn Morris
2014-01-08 8:44 ` Bastien
2014-01-08 8:41 ` Andreas Schwab
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).