From: Chong Yidong <cyd@stupidchicken.com>
To: Carsten Dominik <carsten.dominik@gmail.com>
Cc: Glenn Morris <rgm@gnu.org>,
Emacs developers <emacs-devel@gnu.org>,
Juanma Barranquero <lektu@terra.es>, Miles Bader <miles@gnu.org>
Subject: Re: org changes lost
Date: Mon, 24 Nov 2008 11:32:25 -0500 [thread overview]
Message-ID: <871vx1f5k6.fsf@cyd.mit.edu> (raw)
In-Reply-To: <9EC5D47F-0BFB-4188-B955-FDF018289DA6@gmail.com> (Carsten Dominik's message of "Mon, 24 Nov 2008 13:31:12 +0100")
Carsten Dominik <carsten.dominik@gmail.com> writes:
>> Hmm maybe there should be a standard text that gets sent out to new
>> committers, which includes things like "never, ever, simply upload the
>> newest version of your local sources; always merge."...
>
> My skills in version control my not be sufficient to do this, jumping
> between different version control worlds. So I work by applying
> changed in Emacs to my local copy and reserve the right to undo
> changes made in Emacs (not that this has been necessary recently).
> Usually this works OK, occasionally, like yesterday, I miss something.
Why don't you just use `cvs update' to merge in changes?
next prev parent reply other threads:[~2008-11-24 16:32 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 [this message]
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
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=871vx1f5k6.fsf@cyd.mit.edu \
--to=cyd@stupidchicken.com \
--cc=carsten.dominik@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=lektu@terra.es \
--cc=miles@gnu.org \
--cc=rgm@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).