Git development
 help / color / mirror / Atom feed
From: Alexey Nezhdanov <snake@penza-gsm.ru>
To: git@vger.kernel.org
Subject: Re: "git cvsimport" with branches?
Date: Sun, 17 Jul 2005 12:57:59 +0400	[thread overview]
Message-ID: <200507171257.59384.snake@penza-gsm.ru> (raw)
In-Reply-To: <20050717084053.94D603525D1@atlas.denx.de>

[-- Attachment #1: Type: text/plain, Size: 1638 bytes --]

В сообщении от Воскресенье 17 Июль 2005 12:40 Wolfgang Denk написал(a):
> Is there a way to make "git cvsimport" create branches in git for any
> branches it encounters in the CVS repository?
Heh. I was just preparing mail about the same problem.
It seems that git-cvsimport-script really don't likes branches in CVS.
I have attached simple script that demonstrates this.
On my machine it gives:
=============================
snake@home2:/tmp$ ./testscript
cvs checkout: Updating project
cvs add: scheduling file `a' for addition
cvs add: use `cvs commit' to add this file permanently
/tmp/20050717125452/cvsroot/project/a,v  <--  a
initial revision: 1.1
cvs tag: Tagging .
T a
/tmp/20050717125452/cvsroot/project/a,v  <--  a
new revision: 1.2; previous revision: 1.1
cvs update: Updating .
U a
/tmp/20050717125452/cvsroot/project/a,v  <--  a
new revision: 1.1.2.1; previous revision: 1.1
cvs rlog: Logging project
New a: 2 bytes.
Tree ID 2ce1eef76631e82282e0f7f0cf9e6f3e9a4a0b1e
Committed patch 1 (origin)
Committing initial tree 2ce1eef76631e82282e0f7f0cf9e6f3e9a4a0b1e
Commit ID f7030e1c361f94b8847ef6ad88248a675c7ce5a9
Update a: 4 bytes.
Tree ID 9d3d025fff2e43c6a7b837056632b436c8e31dfe
Parent ID f7030e1c361f94b8847ef6ad88248a675c7ce5a9
Committed patch 2 (origin)
Commit ID 67889434ca9623ad91f8e81e6143fed9c4115a86
Switching from origin to branch1
usage: git-read-tree (<sha> | -m [-u] <sha1> [<sha2> [<sha3>]])
read-tree failed: 256
snake@home2:/tmp$
=============================
Is it a planned behaivoir or cvsimport script were just recently broken?

-- 
Respectfully
Alexey Nezhdanov

[-- Attachment #2: testscript --]
[-- Type: text/plain, Size: 339 bytes --]

#!/bin/sh
dirname=`date +"%Y%m%d%H%M%S"`
mkdir /tmp/$dirname
cd /tmp/$dirname
mkdir cvsroot
declare -x CVSROOT=/tmp/$dirname/cvsroot
cvs init
mkdir cvsroot/project
cvs co project
cd project
echo 1 >a
cvs add a
cvs ci -m 1 a
cvs tag -b branch1
echo 2 >>a
cvs ci -m 2 a
cvs update -r branch1
echo 3 >>a
cvs ci -m 3 a
git-cvsimport-script -v

  reply	other threads:[~2005-07-17  8:59 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-07-17  8:40 "git cvsimport" with branches? Wolfgang Denk
2005-07-17  8:57 ` Alexey Nezhdanov [this message]
2005-07-17  9:37 ` Matthias Urlichs
2005-07-17 10:15   ` Wolfgang Denk
2005-07-17 10:48   ` Alexey Nezhdanov
2005-07-17 12:33     ` Alexey Nezhdanov
2005-07-17 18:02       ` [offtopic]Re: " Alexey Nezhdanov

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=200507171257.59384.snake@penza-gsm.ru \
    --to=snake@penza-gsm.ru \
    --cc=git@vger.kernel.org \
    /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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox