From: Michael Olson <mwolson@gnu.org>
To: emacs-devel@gnu.org
Subject: Re: org changes lost
Date: Tue, 25 Nov 2008 19:20:17 -0800 [thread overview]
Message-ID: <87myfn9nri.fsf@grepfind.mwolson.org> (raw)
In-Reply-To: 118325E6-ED11-4519-BF12-8086BEA715A1@gmail.com
Carsten Dominik <carsten.dominik@gmail.com> writes:
> Yes. I do follow Emacs development through a git mirror, and since
> yesterday I do have a local tag that is called last-sync-with-org-repo.
> At lease as a double-checking mechanism this will be effective, I hope.
I'd recommend using a dedicated "emacs23" branch instead of a tag. Sync
just that branch with Emacs CVS. After syncing from Emacs, cherry-pick
the changes you want for master (I use git add -p to group the changes
into semi-atomic commits first before committing them).
In order to sync to Emacs, sync emacs23 first, merge master to emacs23,
*then* overwrite files in Emacs CVS using what's in the emacs23 branch
(or commit first to a git repo of Emacs, then use git-cvsexportcommit to
apply the patch to CVS).
--
| Michael Olson | FSF Associate Member #652 |
| http://mwolson.org/ | Hobbies: Lisp, HCoop |
| Projects: Emacs, Muse, ERC, EMMS, ErBot, DVC, Planner |
`-------------------------------------------------------'
next prev parent reply other threads:[~2008-11-26 3:20 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-11-23 23:53 org changes lost Glenn Morris
2008-11-24 2:36 ` Glenn Morris
2008-11-24 3:56 ` Miles Bader
2008-11-24 12:31 ` Carsten Dominik
2008-11-24 16:32 ` Chong Yidong
2008-11-25 9:30 ` Carsten Dominik
2008-11-24 17:29 ` Glenn Morris
2008-11-24 19:31 ` Bastien
2008-11-24 18:23 ` Reiner Steib
2008-11-25 9:24 ` Bastien
2008-11-25 17:44 ` Reiner Steib
2008-11-25 9:31 ` Carsten Dominik
2008-11-25 2:50 ` Stefan Monnier
2008-11-25 3:10 ` Chong Yidong
2008-11-25 15:11 ` Stefan Monnier
2008-11-25 9:01 ` Yavor Doganov
2008-11-25 15:14 ` Stefan Monnier
2008-11-25 9:03 ` Bastien
2008-11-25 9:33 ` Carsten Dominik
2008-11-25 15:19 ` Stefan Monnier
2008-11-25 17:11 ` Bastien
2008-11-25 9:38 ` Carsten Dominik
2008-11-26 3:20 ` Michael Olson [this message]
2008-11-24 11:06 ` Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87myfn9nri.fsf@grepfind.mwolson.org \
--to=mwolson@gnu.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).