From: "Bart Schaefer" <schaefer@candle.brasslantern.com>
To: Zsh hackers list <zsh-workers@sunsite.auc.dk>
Subject: Re: public CVS archive
Date: Tue, 29 Jun 1999 15:53:20 +0000 [thread overview]
Message-ID: <990629155320.ZM21187@candle.brasslantern.com> (raw)
In-Reply-To: <19990629142840.A28884@caerdonn.eurocontrol.fr>
On Jun 29, 2:28pm, Ollivier Robert wrote:
} Subject: Re: public CVS archive
}
} As long as you don't have a myriad of branches, CVS is fine. Having to
} branches, one for 3.0.x and the other for 3.1.x is bearable. It makes
} merging easier.
Actually, in this particular case it makes merging more difficult. The
directory structure has changed in 3.1.x (for example, all the zle_* files
have moved to the Src/Zle subdir; in 3.0.x they're in Src) and bits and
pieces of things have moved as well (for example, bin_fg() has moved from
builtin.c to jobs.c, though both files are still in Src; other things have
moved from builtin.c to files in new directory Src/Builtins).
CVS is particularly poor at tracking entire file renames -- you have to
remove the file from one directory and add it in another -- and doesn't
help any more than any other source-code-control system when it comes to
whole functions moved from one file to another.
For many files, therefore, its extremely misleading to try to merge from
3.1.x<-->3.0.x using CVS's merge capability. Either you can't do it at
all, or you end up with tracts of missing (in the 3.1-->3.0 direction) or
duplicated (3.0-->3.1) code in some files. It just isn't worth it; it's
easier to generate patches and then figure out which files to apply them
to.
--
Bart Schaefer Brass Lantern Enterprises
http://www.well.com/user/barts http://www.brasslantern.com
prev parent reply other threads:[~1999-06-29 15:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
1999-06-26 14:56 pws-24 Peter Stephenson
1999-06-28 10:05 ` Feature freeze for 3.1.6? pws-24 Andrej Borsenkow
1999-06-28 10:02 ` Peter Stephenson
1999-06-28 10:44 ` Andrej Borsenkow
1999-06-28 15:26 ` Bart Schaefer
1999-06-28 17:51 ` public CVS archive Peter Stephenson
1999-06-29 9:19 ` Andrej Borsenkow
1999-06-29 12:28 ` Ollivier Robert
1999-06-29 15:53 ` 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=990629155320.ZM21187@candle.brasslantern.com \
--to=schaefer@candle.brasslantern.com \
--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).