Selectively merging distinct repositories

[Francois Tigeot]

On Thu, Oct 28, 2010 at 01:50:12PM -0200, Wagner Bruna wrote:
> On 10/26/2010 06:01 PM, Francois Tigeot wrote:
> > On Tue, Oct 26, 2010 at 11:09:58AM -0500, Haszlakiewicz, Eric wrote:
> >>> -----Original Message-----
> >>> From: mercurial-bounces at selenic.com
> >> [mailto:mercurial-bounces at selenic.com]
> >>>
> >>> I have currently two existing repositories:
> >>> - a public one: hg with some small bits of code
> >>> - a private one: svn with about 5 years of history
> >>>
> >>> I want to merge both repositories and preserve their history as much
> >>> as possible.
> > 
> > I'm beginning to think I should split the svn repo. in many small ones,
> > filter their history separately, and then merge them again.
> > 
> > Is this correct or is there an easier way ?
> 
> Recently I needed to fix a quite messy repository converted from CVS
> (with gems like grouping different paths by different branches); I
> ended up changing the convert hg sink to do the job.

[...]

> Another option could be changing the getfilectx function just above to
> clobber the sensitive data when retrieving file contents; it may be a
> better way if you want to keep the other file changes a bit more
> consistent.

Thank you, both of you.

I'm not quite sure of the number of "dirty" files yet, I'm just assuming
the worst for the moment.
Once the audit is complete, I will have a better knowledge of my options.

As Eric suggested, I will play a bit with different conversion options;
in the best case I'll only have to exclude some small number of files
and commit clean versions later.

In the worst... well it's good to know I can automate part of the work :)

-- 
Francois Tigeot