Re: Some cvs2bzr thoughts

Greg Ward wrote:
> On Tue, Oct 6, 2009 at 6:58 PM, Max Bowsher <[email protected]> wrote:
>> I've just been trying out cvs2bzr - some thoughts:
>>
> [...]
>> 2) Having done this, you end up with lots and lots of branches. Which is
>> better than the tortuous history of every tag fixup in one branch, but
>> poses a problem that bzr tags are local to a branch. Thus, its
>> impossible to see these tags when browsing the trunk. I believe the
>> proper way to solve this for a bzr conversion is to merge the tag fixup
>> branch back into its primary source branch immediately after making the
>> last commit on the fixup branch. I'll need to pore of the source a bit
>> more to figure out how to make this happen, but does the concept sound sane?
> 
> cvs2hg had exactly the same problem.  (Mercurial really doesn't like
> repos with many many heads.)  Oddly enough, I came up with and
> implemented the same solution as you propose.  My code has not yet
> been merged into the cvs2svn trunk, so you might want to poke around
> my "branch" of cvs2svn a bit:
> 
>   http://vc.gerg.ca/hg/cvs2svn/
> 
> In particular, an explanation of how I handled fixups is in
> 
>   http://vc.gerg.ca/hg/cvs2svn/raw-file/tip/README.cvs2hg
> 
> and the code (class HgOutputOption) is in
> 
>   http://vc.gerg.ca/hg/cvs2svn/raw-file/tip/cvs2svn_lib/hg_output_option.py
> 
> Follow self.pending_fixups to see how it works.


Interesting... your approach is to add the extra parent on the next
convenient revision that would happen anyway.

I'm not entirely convinced that's the right thing to do, since it
ascribes the merge to some author who most likely had nothing to do with it.

I've hacked up an initial implementation that does an immediate
dedicated fixup commit after each tag commit, which I think is preferable.

What are your thoughts on this difference in design?

Max.

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

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

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)

iEYEARECAAYFAkrPASUACgkQfFNSmcDyxYCh1QCgxJCNR9G8yKGR+CuLBJIf+shM
pEgAnjKVUU6fFQYlLQ5usXkh84cgX9qz
=BGqh
-----END PGP SIGNATURE-----