From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Dan Nicolaescu <dann@ics.uci.edu>
Cc: Thien-Thi Nguyen <ttn@gnuvola.org>, emacs-devel@gnu.org
Subject: Re: VMS support
Date: Sun, 27 Jul 2008 15:31:18 -0400 [thread overview]
Message-ID: <jwv1w1f3zk8.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <200807271906.m6RJ6VOw008253@sallyv1.ics.uci.edu> (Dan Nicolaescu's message of "Sun, 27 Jul 2008 12:06:30 -0700")
> If you only can spend a few minutes at a time when doing this (and
> I do), you can't write ChangeLogs when doing the work because they
> will conflict on updates.
You should place the ChangeLog text somewhere where it won't conflict
(e.g. some temp file, or further down in the ChangeLog file where there
will hopefully not be any changes) and then move it into place when you
do the commit. Or you simply use C-x ^ r to auto-resolve the conflicts.
> When updating you get unnecessary conflicts that need to be resolved.
Again, since you're removing unused code, conflicting changes should be
relatively infrequent. Doesn't sound like a big deal.
> When working offline you can't cvs remove files.
Yes, it's an irksome part of CVS. I even submitted a patch to fix it
(together with a patch to add files offline as well) and used it for
a while. But nowadays, I just directly edit the CVS/Entries file when
faced with this problem (after all, all it takes is to add a "-" at the
right place).
> If you cvs remove files before tagging, the tag won't apply to that
> file.
Really? Duh, that's a nasty bug. I guess it means you should indeed
refrain from "cvs removing" before the commit. Instead, you should only
"rm" the files, and keep track of them, so that when you commit you do
"cvs tag; cvs rm <markedfiles>; cvs commit". Kind of ugly indeed.
> On the other hand the gain is inexistent.
If someone ever intends to pick up this code and do something useful
with it, having it cleanly delimited by before/after tags is
very helpful. If it's not commited as a single commit, you risk having
your change be interleaved with other unrelated changes. Of course, if
nobody ever picks it up, the gain is indeed inexistent, but the cost
really seems pretty minor compared to the effort needed to figure out
how to remove the code (which parts to remove, etc...).
Thank you for the effort,
Stefan
next prev parent reply other threads:[~2008-07-27 19:31 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87iquzmcxm.fsf@stupidchicken.com>
[not found] ` <87d4l76ntu.fsf@ambire.localdomain>
2008-07-21 19:52 ` VMS support Chong Yidong
2008-07-23 10:27 ` Thien-Thi Nguyen
2008-07-23 20:05 ` Stefan Monnier
2008-07-24 7:44 ` Thien-Thi Nguyen
2008-07-24 13:59 ` Stefan Monnier
2008-07-24 16:55 ` Dan Nicolaescu
2008-07-24 19:58 ` Stefan Monnier
2008-07-27 18:41 ` Dan Nicolaescu
2008-07-27 18:48 ` Stefan Monnier
2008-07-27 19:06 ` Dan Nicolaescu
2008-07-27 19:31 ` Stefan Monnier [this message]
2008-07-27 19:51 ` Dan Nicolaescu
2008-07-27 20:44 ` Stefan Monnier
2008-07-27 21:41 ` Dan Nicolaescu
2008-07-28 9:15 ` Thien-Thi Nguyen
2008-07-24 17:34 ` Thien-Thi Nguyen
2008-07-24 20:00 ` Stefan Monnier
2008-07-24 20:40 ` Thien-Thi Nguyen
2008-07-24 2:23 ` Richard M Stallman
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv1w1f3zk8.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=dann@ics.uci.edu \
--cc=emacs-devel@gnu.org \
--cc=ttn@gnuvola.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 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.