From: Clint Adams <clint@zsh.org>
To: zsh-workers@sunsite.dk
Subject: vcs conversion tools hate zsh sf cvs repo [was Re: PATCH: zfautocheck equals signs]
Date: Tue, 3 Jul 2007 12:43:18 -0400 [thread overview]
Message-ID: <20070703164318.GB17859@scowler.net> (raw)
In-Reply-To: <20070703070627.GA3164@scowler.net>
On Tue, Jul 03, 2007 at 03:06:27AM -0400, Clint Adams wrote:
> This somewhat gratuitous change is to get a rev 1.2 on the file;
> I suspect that the state of the branches is confusing tailor.
In case there is anyone else who cares about this:
Doc/Zsh/mod_cap.yo | 7 ++--
Doc/Zsh/mod_complete.yo | 7 ++--
Doc/Zsh/mod_example.yo | 7 ++--
Doc/Zsh/mod_files.yo | 49 ++++++++++++++++++++++++++++--
Doc/Zsh/mod_mapfile.yo | 15 +++++----
Doc/Zsh/mod_zleparameter.yo | 15 ++++-----
Doc/intro.ms | 8 ++++
Doc/zshzftpsys.yo | 3 +
Etc/Makefile.in | 15 ++++++---
Functions/Prompts/prompt_adam1_setup | 29 +++++++++++++++--
Functions/Prompts/prompt_redhat_setup | 1
Functions/Prompts/prompt_suse_setup | 1
Functions/Zftp/zfrglob | 17 ++++------
Functions/Zftp/zftp_chpwd | 37 ++++++++++++----------
Misc/.distfiles | 4 +-
Misc/bash2zshprompt | 17 ++++++----
Misc/c2z | 10 +++++-
Misc/compctl-examples | 20 ++++++------
Misc/globtests.ksh | 13 +++++++
Misc/job-control-tests | 45 +++++++++++++++++++++++++++
Misc/lete2ctl | 49 ++++++++++++++++++++++++++----
Src/Zle/.distfiles | 8 +++-
Util/preconfig | 2 -
aclocal.m4 | 29 ++++++++++++++++-
That is the current discrepancy between a cvs checkout of HEAD and a git
conversion created by tailor 0.9.28 with the cvs backend. With the
cvsps backend, something entirely different and horrible is achieved.
For the files above, the HEAD revisions are on the vendor branch (they
are numbered 1.1.1.1 and 1.1.1.4, for instance), but the revisions that
make it to the git HEAD checkout are only 1.1.
A subsequent commit will change the revision number to 1.2, and then
tailor will commit a -r1.1 -r1.2 diff to git, which is less than ideal,
but syncs the file in both places and will presumably keep the history
properly thenceforth.
I don't know whether this should be treated as a bug in tailor or in our
CVS repository.
next prev parent reply other threads:[~2007-07-03 16:43 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-03 7:06 PATCH: zfautocheck equals signs Clint Adams
2007-07-03 16:43 ` Clint Adams [this message]
2007-07-03 17:16 ` vcs conversion tools hate zsh sf cvs repo [was Re: PATCH: zfautocheck equals signs] Peter Stephenson
2007-07-03 18:00 ` Clint Adams
2007-07-03 18:42 ` Clint Adams
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=20070703164318.GB17859@scowler.net \
--to=clint@zsh.org \
--cc=zsh-workers@sunsite.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).