Re: Files on branches without commits

Roman Shterenzon wrote:
> It seems that cvs2svn misses files which reside on a branch which has
> no commits (for this file). Let me give an example (I'm trying to
> make a git mirror of squid2 sources):
> 
> I'm interested in, say, SQUID_2_7 branch:
> 
> cvs log acinclude.m4 .. SQUID_2_7: 1.10.0.2 ..
> 
> If there was a commit, it would have been assigned a 1.10.2.1 number,
> but there's no such commit. The latest commit it the 1.10 from which
> the branch was tagged. Effectively this skips the file from the
> resulting SQUID_2_7 branch in git/subversion (because, I suspect,
> there's no file with number 1.10.2 (which will be result of
> define_symbol@collect_data.py , I think).

It is not clear whether you are speculating about a hypothetical
weakness of cvs2git or whether you actually tried the conversion and got
incorrect results.  I have no reason to expect that the scenario you
describe should be problematic for cvs2git, but if you have observed an
actual problem, please report the bug with enough information that we
can analyze it (the FAQ describes how to do so).

> Also, another issue (which might be not related at all), is that I
> wasn't able to export, as it was trying to address a hash by a
> non-existing key (in _get_source_mark @ git_output_option.py)
> 
> This fixed it (perhaps incorrectly):
> 
> Index: cvs2svn_lib/git_output_option.py
> ===================================================================
> --- cvs2svn_lib/git_output_option.py    (revision 5022)
> +++ cvs2svn_lib/git_output_option.py    (working copy)
> @@ -426,6 +426,8 @@
>        mark = self._get_source_mark(source_lod, source_revnum)
>        self._set_symbol(svn_commit.symbol, mark)
>        self._mirror.copy_lod(source_lod, svn_commit.symbol, source_revnum)
> +      # XXX
> +      self._set_lod_mark(svn_commit.symbol, source_revnum, mark)
>      else:
>        Log().debug(
>            '%s will be created via fixup commit(s)' % (svn_commit.symbol,)
> 
> Any ideas how the first one can be resolved, and whenever I did the
> right thing with my fix for the second issue?

Again, without a bug report it is hard to guess how to reproduce your
problem, let alone determine whether your proposed fix is correct.

Michael

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

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