[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Since there's a resurgence of interest in cvs2svn...

From: Shun-ichi GOTO <gotoh_at_taiyo.co.jp>
Date: 2002-10-23 07:19:07 CEST

>>>>> at Tue, 22 Oct 2002 18:49:59 -0700,
>>>>> Greg Stein <gstein@lyra.org> said,

> Anyways, when that happened, the scanning loop moved "up" in the function,
> and it overwrote the ID used to key into the Commit buckets. I changed the
> variable, so it should be hunky dory now...
>
> Try it out :-)

Yes, it works.

But it does not solve my problem with Marko's branch support patch
reported bellow:
  Subject: Re: cvs2svn patch in the works...
  From: Shun-ichi GOTO <gotoh@taiyo.co.jp>
  Date: Tue, 22 Oct 2002 23:25:53 +0900 (JST)

Following is a result of cvs2svn (r3446, without branch patch)
for my test repository:

-----(cut here)-----
debian% ./cvs2svn.py -s svn-r Repository/test
----- pass 1 -----
Repository/test/b.c,v
Repository/test/Attic/a.c,v
----- pass 2 -----
----- pass 3 -----
----- pass 4 -----
committing: Sun Sep 30 13:27:25 2001, over 0 seconds
    changing 1.1 : /a.c
    CONFLICTS: '_24f5ffbf_p_char'
    new revision: 1
committing: Sun Sep 30 15:25:29 2001, over 0 seconds
    changing 1.3 : /a.c
    CONFLICTS: '_24f5ffbf_p_char'
    new revision: 2
committing: Sun Sep 29 14:44:59 2002, over 133 seconds
    changing 1.1 : /b.c
    changing 1.2 : /b.c
    changing 1.4 : /a.c
    deleting 1.5 : /a.c
    CONFLICTS: '_24f5ffbf_p_char'
    new revision: 3
pass 1: 0 seconds
pass 2: 0 seconds
pass 3: 0 seconds
pass 4: 0 seconds
 total: 0 seconds
debian%
-----(cut here)-----

See final commiting, revision 3 contains both changing of a.c:1.4 and
deleting of a.c:1.5.

1) This means changes in a.c:1.4 are not recorded in
   svn repository. Is it acceptable?

2) For branching support patch,
   
   If cvs repository have tag with a.c:1.4 and b.c:1.2, this grouping
   (by cvs2svn.py r3446) whould prevents right tagging because revision
   3 only has b.c and revision 2 doesn't have a.c:1.4.

   For correct tagging, I think we should not add new revision to commit
   group if same file is already added and it have tag. And we should
   not add another file to commit group, which have different tag agaist
   tag in group. In other word, we should keep commit group as no tag
   or one tag at most.

--- Regards,
 Shun-ichi Goto <gotoh@taiyo.co.jp>
   R&D Group, TAIYO Corp., Tokyo, JAPAN

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Oct 23 07:20:34 2002

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.