Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: vcs conversion tools hate zsh sf cvs repo [was Re: PATCH: zfautocheck equals signs]
- X-seq: zsh-workers 23650
- From: Peter Stephenson <pws@xxxxxxx>
- To: zsh-workers@xxxxxxxxxx
- 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
- In-reply-to: <20070703164318.GB17859@xxxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- Organization: CSR
- References: <20070703070627.GA3164@xxxxxxxxxxx> <20070703164318.GB17859@xxxxxxxxxxx>
On Tue, 3 Jul 2007 12:43:18 -0400
Clint Adams <clint@xxxxxxx> 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@xxxxxxx> 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
Messages sorted by:
Reverse Date,
Date,
Thread,
Author