Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

vcs conversion tools hate zsh sf cvs repo [was Re: PATCH: zfautocheck equals signs]



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.



Messages sorted by: Reverse Date, Date, Thread, Author