zsh-workers
 help / color / mirror / code / Atom feed
From: Peter Stephenson <pws@csr.com>
To: zsh-workers@sunsite.dk
Subject: Re: vcs conversion tools hate zsh sf cvs repo [was Re: PATCH: zfautocheck equals signs]
Date: Tue, 3 Jul 2007 18:16:19 +0100	[thread overview]
Message-ID: <20070703181619.3903cad4@news01.csr.com> (raw)
In-Reply-To: <20070703164318.GB17859@scowler.net>

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


  reply	other threads:[~2007-07-03 17:16 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 ` vcs conversion tools hate zsh sf cvs repo [was Re: PATCH: zfautocheck equals signs] Clint Adams
2007-07-03 17:16   ` Peter Stephenson [this message]
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=20070703181619.3903cad4@news01.csr.com \
    --to=pws@csr.com \
    --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).