* Re: [elpa] master 65ee800 1/3: Merge in changes from GNU Elpa subtree
[not found] ` <20160722042707.0C622220106@vcs.savannah.gnu.org>
@ 2016-07-22 14:21 ` Stefan Monnier
2016-07-22 17:35 ` Matthew Carter
0 siblings, 1 reply; 3+ messages in thread
From: Stefan Monnier @ 2016-07-22 14:21 UTC (permalink / raw)
To: emacs-devel; +Cc: Matthew Carter
> None of the subtree commands seem to properly merge subtree back
> upstream into the repository, so manually handle it here.
Indeed, the 2-way synchronization is a bit inconvenient with subtrees.
You might be able to use something like "git subtree split" to get
something you can then merge into your upstream tree, but AFAIK it will
not always DTRT.
Stefan
> * Fix some quoting problems in doc strings
> * packages/ahungry-theme/ahungry-theme.el: Use lexical-binding.
> * color-theme-ahungry.el: Don't burp if color-theme is missing
> ---
> ahungry-theme.el | 4 ++--
> color-theme-ahungry.el | 3 +--
> 2 files changed, 3 insertions(+), 4 deletions(-)
> diff --git a/ahungry-theme.el b/ahungry-theme.el
> index 7d10791..3b35f59 100644
> --- a/ahungry-theme.el
> +++ b/ahungry-theme.el
> @@ -1,4 +1,4 @@
> -;;; ahungry-theme.el --- Ahungry color theme for Emacs. Make sure to (load-theme 'ahungry).
> +;;; ahungry-theme.el --- Ahungry color theme for Emacs. Make sure to (load-theme 'ahungry). -*- lexical-binding:t -*-
> ;; Copyright (C) 2015,2016 Free Software Foundation, Inc.
> @@ -87,7 +87,7 @@
> Leave this alone to retain defaults.
> Default value:
> - '(:family \"Terminus\" :foundry \"xos4\"
> + (:family \"Terminus\" :foundry \"xos4\"
> :slant normal :weight normal
> :height 100 :width normal)")
> diff --git a/color-theme-ahungry.el b/color-theme-ahungry.el
> index e9ded6e..14980d8 100644
> --- a/color-theme-ahungry.el
> +++ b/color-theme-ahungry.el
> @@ -36,8 +36,7 @@
> ;;; Code:
> -(eval-when-compile
> - (require 'color-theme))
> +(declare-function color-theme-install "color-theme" (theme))
> ;; Currently background-color and foreground-color are intentionally left
> ;; commented out, so that the color-theme in terminal mode will not overwrite
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [elpa] master 65ee800 1/3: Merge in changes from GNU Elpa subtree
2016-07-22 14:21 ` [elpa] master 65ee800 1/3: Merge in changes from GNU Elpa subtree Stefan Monnier
@ 2016-07-22 17:35 ` Matthew Carter
2016-07-22 17:47 ` Stefan Monnier
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Carter @ 2016-07-22 17:35 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> None of the subtree commands seem to properly merge subtree back
>> upstream into the repository, so manually handle it here.
>
> Indeed, the 2-way synchronization is a bit inconvenient with subtrees.
> You might be able to use something like "git subtree split" to get
> something you can then merge into your upstream tree, but AFAIK it will
> not always DTRT.
>
>
> Stefan
>
>
Thanks Stefan, I'll have to give that a whirl next time.
I spent a few hours tinkering with various combinations of git subtree
pushes and pulls to no real avail in an attempt to actually merge the
commits from the ELPA repository to my remote (where the subtree pulls
from) without any success, and eventually conceded that I would just
have to duplicate the work manually in the remote.
Next time it comes up, I'll report back on how "git subtree split"
performs.
--
Matthew Carter (m@ahungry.com)
http://ahungry.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [elpa] master 65ee800 1/3: Merge in changes from GNU Elpa subtree
2016-07-22 17:35 ` Matthew Carter
@ 2016-07-22 17:47 ` Stefan Monnier
0 siblings, 0 replies; 3+ messages in thread
From: Stefan Monnier @ 2016-07-22 17:47 UTC (permalink / raw)
To: emacs-devel
> Next time it comes up, I'll report back on how "git subtree split"
> performs.
Otherwise, there's always the old way:
- bring elpa.git up-to-date w.r.t upstream (with "git pull").
- git diff packages/<pkg> | (cd ../elpawhere; patch -p3)
Stefan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-07-22 17:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160722042705.16008.91462@vcs.savannah.gnu.org>
[not found] ` <20160722042707.0C622220106@vcs.savannah.gnu.org>
2016-07-22 14:21 ` [elpa] master 65ee800 1/3: Merge in changes from GNU Elpa subtree Stefan Monnier
2016-07-22 17:35 ` Matthew Carter
2016-07-22 17:47 ` Stefan Monnier
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.