Re: Branches / Tags folders structure

Geppo Rello <[email protected]> Thu, 4 Oct 2012 16:06:27 +0100
Newsgroups gmane.comp.version-control.subversion.cvs2svn.user
Message-ID <CAHaUfNv6Q=7YZpuoOxJC_K+pBqdnhKcM944RuRzNQzDmZpm3Og@mail.gmail.com>
Thank you guys.

Michael,
unfortunately I don't have control over the CVS repository and I'm not
sure how I could create a new "parent" project.

Olli,
your solution seems to work. However I am missing some files, two or
three in each branch. It seems pretty random: I can't find a pattern.
Any suggestion?

P.S. I had to change a couple of things from your instructions. Maybe
that's the cause of the missing files?

1) Instead of "Edit in symbol-hints.txt the forth column in the lines
starting with 0", I have changed the fourth column in ALL lines that
showed the unwanted structure and replaced it with the wanted one,
whether they were starting with 0 or any other number.

2) Instead of:


$> cvs2svn -p 3:16 --options=YourOptionsFile

I had to run

$> cvs2svn --options=YourOptionsFile
otherwise I get the following error:

----- pass 3 (CollateSymbolsPass) -----
Traceback (most recent call last):
  File "cvs2svn-trunk/cvs2svn", line 70, in <module>
    svn_main(os.path.basename(sys.

argv[0]), sys.argv[1:])
  File "/home/cvsdata/cvs2svn-trunk/cvs2svn_lib/main.py", line 113, in svn_main
    main(progname, run_options, pass_manager)
  File "/home/cvsdata/cvs2svn-trunk/cvs2svn_lib/main.py", line 96, in main
    pass_manager.run(run_options)
  File "/home/cvsdata/cvs2svn-trunk/cvs2svn_lib/pass_manager.py", line
177, in run
    config.STATISTICS_FILE % (i + 1 - 1,)
  File "/home/cvsdata/cvs2svn-trunk/cvs2svn_lib/stats_keeper.py", line
185, in read_stats_keeper
    f = open(filename, 'rb')
IOError: [Errno 2] No such file or directory: 'cvs2svn-ri-tmp/statistics-02.pck'



On 1 October 2012 20:04, olli hauer <[email protected]> wrote:
>
> On 2012-10-01 12:39, Geppo Rello wrote:
> > Hi,
> > I have succesfully used CVS2SVN with the Options file to migrate a CVS
> > repository.
> > The only thing that I don't like it's the way the Branches and Tags folder
> > have been structured i.e.
> >
> > branches/project1/branch1
> > branches/project1/branch2
> > branches/project1/branch3
> >
> > branches/project2/branch1
> > branches/project2/branch2
> > branches/project2/branch3
> >
> > How to I achieve the following structure?
> >
> > branches/branch1/project1
> > branches/branch1/project2
> >
> > branches/branch2/project1
> > branches/branch2/project2
> >
> > branches/branch3/project1
> > branches/branch3/project2
> >
> > Many thanks!
>
> If you look inside the options file template you can
> find a section starting with
>  global_symbol_strategy_rules = [
>  ...
>
> and ~40 lines before this directive
>  ctx.symbol_info_filename = None
>
> Change "None" to
>  ctx.symbol_info_filename = 'symbols-out.txt',
>
> run $> cvs2svn -p 1:3 --options=YourOptionsFile
> then copy symbol-out.txt to symbol-hints.txt.
>
> Edit in symbol-hints.txt the forth column in the
> lines starting with "0" so it match the new path,
> write the following line into
>  global_symbol_strategy_rules  = [
>  SymbolHintsFileRule('symbol-hints.txt'),
> the `,' at the end of the line is important.
>
> Now run the command
> $> cvs2svn -p 3:16 --options=YourOptionsFile
>
> and enjoy your new svn repo.
>
> // olli

------------------------------------------------------
http://cvs2svn.tigris.org/ds/viewMessage.do?dsForumId=1670&dsMessageId=3012423

To unsubscribe from this discussion, e-mail: [[email protected]].