PATCH: zfautocheck equals signs

PATCH: zfautocheck equals signs

[Clint Adams]

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.

Index: Functions/Zftp/zfautocheck
===================================================================
RCS file: /cvsroot/zsh/zsh/Functions/Zftp/zfautocheck,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 zfautocheck
--- Functions/Zftp/zfautocheck	10 Sep 1999 13:58:11 -0000	1.1.1.3
+++ Functions/Zftp/zfautocheck	3 Jul 2007 07:01:56 -0000
@@ -24,16 +24,16 @@
 
 if [[ -z $ZFTP_HOST ]]; then
   zfopen || return 1
-  [[ $1 = *d* ]] || do_close=1
+  [[ $1 == *d* ]] || do_close=1
 elif zftp test 2>/dev/null; then
   return 0
 else
   zfopen || return 1
 fi
 
-if [[ $1 = *n* ]]; then
+if [[ $1 == *n* ]]; then
   return 0
-elif [[ -n $lastloc && $ZFTP_HOST = ${lastloc%%:*} ]]; then
+elif [[ -n $lastloc && $ZFTP_HOST == ${lastloc%%:*} ]]; then
   # don't print directory since we're just going back where we were.
   zfcd ${lastloc#*:} >& /dev/null
 fi

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

[Clint Adams]

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.

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

[Peter Stephenson]

On Tue, 3 Jul 2007 12:43:18 -0400
Clint Adams <clint@zsh.org> wrote:
> 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.

There was also Completion/README at 1.1.1.6.

I think I've fixed this, but you might want to update and compare some
files to make sure.  What I did was the equivalent of the following for
each file:

cvs update -r1 file
cvs update -p -r1.1.1 file >file
cvs commit file
cvs update -A file

Comparing with a previously synced set of revisions seemed to show this
worked OK.

There are various files still at 1.1.1.1.  I haven't fixed these.

-- 
Peter Stephenson <pws@csr.com>                  Software Engineer
CSR PLC, Churchill House, Cambridge Business Park, Cowley Road
Cambridge, CB4 0WZ, UK                          Tel: +44 (0)1223 692070


To access the latest news from CSR copy this link into a web browser:  http://www.csr.com/email_sig.php

To get further information regarding CSR, please visit our Investor Relations page at http://ir.csr.com/csr/about/overview

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

[Clint Adams]

On Tue, Jul 03, 2007 at 06:16:19PM +0100, Peter Stephenson wrote:
> I think I've fixed this, but you might want to update and compare some
> files to make sure.  What I did was the equivalent of the following for

Your jiggery pokery did the trick.  The diff is reduced to the following
obsolete directories:

 Completion/Bsd       |only
 Completion/Builtins  |only
 Completion/Commands  |only
 Completion/Core      |only
 Completion/Cvs       |only
 Completion/Mandrake  |only
 Completion/Pbmplus   |only
 Completion/Rpm       |only
 Completion/SysV      |only
 Completion/User      |only
 Functions/Completion |only
 Src/Aliases          |only

I think this is probably a deficiency in tailor for not removing them
from git.

cvsps (and thus the tools that use it) is still confused by something else.

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

[Clint Adams]

On Tue, Jul 03, 2007 at 02:00:42PM -0400, Clint Adams wrote:
> I think this is probably a deficiency in tailor for not removing them
> from git.

Er, scratch that; git doesn't track directories.