From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
To: Oliver Kiddle <opk@u.genie.co.uk>, zsh-workers@sunsite.auc.dk
Subject: CVS merge conflicts (Re: Completion system directories)
Date: Wed, 3 May 2000 16:23:36 +0000 [thread overview]
Message-ID: <1000503162336.ZM21917@candle.brasslantern.com> (raw)
In-Reply-To: <39100EE4.8EE393ED@u.genie.co.uk>
On May 3, 12:35pm, Oliver Kiddle wrote:
}
} While we're on the subject of cvs can people be a little careful with
} the ChangeLog - I've fixed it a couple of times when the merge has gone
} wrong. For an example, do:
} cvs diff -r 1.183 -r 1.184 ChangeLog
} An update before a commit might make it less likely?
I always do update before I commit. One *can't* commit without first
updating, in fact. An update before editing the ChangeLog would help
if not for race conditions; in the case of r1.184 I'd already done an
update, edited the file, and then attempted to commit, only to have it
fail because your commit had gone in in the meantime. The 20 minutes
between r1.183 and r1.184 were me attempting (apparently unsuccessfully)
to fix the merge conflicts that resulted from my subsequent update.
The real problem is that the diff algorithm is very bad at handling
a series of short paragraphs separated by blank lines, because it
considers the overlap in the two versions to end at a matching line,
even if the matching lines are both empty.
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
prev parent reply other threads:[~2000-05-03 16:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2000-05-03 9:14 Completion system directories Sven Wischnowsky
2000-05-03 9:57 ` Adam Spiers
2000-05-03 10:52 ` Bart Schaefer
2000-05-03 10:30 ` Bart Schaefer
2000-05-03 11:03 ` Andrej Borsenkow
2000-05-03 11:10 ` Peter Stephenson
2000-05-03 11:24 ` Geoff Wing
2000-05-03 16:35 ` Bart Schaefer
2000-05-03 16:51 ` Peter Stephenson
2000-05-03 11:35 ` Oliver Kiddle
2000-05-03 16:23 ` Bart Schaefer [this message]
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=1000503162336.ZM21917@candle.brasslantern.com \
--to=schaefer@candle.brasslantern.com \
--cc=opk@u.genie.co.uk \
--cc=zsh-workers@sunsite.auc.dk \
/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.vuxu.org/mirror/zsh/
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 NNTP newsgroup(s).