[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: org changes lost
From: |
Michael Olson |
Subject: |
Re: org changes lost |
Date: |
Tue, 25 Nov 2008 19:20:17 -0800 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) |
Carsten Dominik <address@hidden> 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 |
`-------------------------------------------------------'
- Re: org changes lost, (continued)
- Re: org changes lost, Stefan Monnier, 2008/11/24
- Re: org changes lost, Chong Yidong, 2008/11/24
- Re: org changes lost, Stefan Monnier, 2008/11/25
- Re: org changes lost, Yavor Doganov, 2008/11/25
- Re: org changes lost, Stefan Monnier, 2008/11/25
- Re: org changes lost, Carsten Dominik, 2008/11/25
- Re: org changes lost,
Michael Olson <=
- Re: org changes lost, Bastien, 2008/11/25
- Re: org changes lost, Carsten Dominik, 2008/11/25
- Re: org changes lost, Stefan Monnier, 2008/11/25
- Re: org changes lost, Bastien, 2008/11/25
Re: org changes lost, Carsten Dominik, 2008/11/24