[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: org changes lost

From: Carsten Dominik
Subject: Re: org changes lost
Date: Tue, 25 Nov 2008 10:30:30 +0100

On Nov 24, 2008, at 5:32 PM, Chong Yidong wrote:

Carsten Dominik <address@hidden> 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?

How would that work?  I copy my new files into the lisp/org directory
and then call cvs update to merge any changes from the Emacs crowd?
Hmm, this means the I cannot call cvs update in between, just to
get the changes in other files.

OK, thinking about it.

- Carsten

reply via email to

[Prev in Thread] Current Thread [Next in Thread]