Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ooo-dev@incubator.apache.org
Received-SPF: pass (nike.apache.org: domain of gcaiod-ooo-dev@m.gmane.org
 designates 80.91.229.12 as permitted sender)
To: ooo-dev@incubator.apache.org
From: Michael Stahl <mst@openoffice.org>
Subject: Re: [Repo][Proposal] OOO340 SVN Dump file import
Date: Mon, 15 Aug 2011 23:48:01 +0200
Lines: 51
Message-ID: <j2c46m$mlb$1@dough.gmane.org>
References: 
 <CAP-ksohk1-5NgLH9-nA+4eeaAsUc4KNUh=pzz8do2nCptzG0Bg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
 rv:5.0) Gecko/20110707 Thunderbird/5.0
In-Reply-To: 
 <CAP-ksohk1-5NgLH9-nA+4eeaAsUc4KNUh=pzz8do2nCptzG0Bg@mail.gmail.com>

On 15.08.2011 18:46, Rob Weir wrote:
> We've been discussing for two months now how to get Hg over to SVN.
> There have been several suggestions for how the CWS's and complete
> revision history could be migrated over, but little progress has been
> made.  Either the proposals didn't work, or no volunteers stepped
> forward to implement them.
>
> The alternative proposal was to just check in the tip of the trunk,
> without history, and then migrate Hg to Apache-Extras.org, where Hg is
> supported.  I've made some progress on this proposal.

very good!

> Here's what I did.  I'd like some review, to make sure I didn't screw
> anything up. I am neither an Hg nor a SVN expert.  But I do have a big
> harddrive.
>
> I used Subversion command-line client, version
> 1.6.17-SlikSvn-tag-1.6.17@1130896-WIN32.
>
> I first brought down OOo, both the trunk and the language stuff, into
> separate directories:
>
> hg clone http://hg.services.openoffice.org/OOO340
> hg clone http://hg.services.openoffice.org/master_l10n/OOO340/
>
> I then moved these into a common directory structure, as Ingrid had
> earlier suggested:
>
> ooo/trunk/core --- all the OOO340 stuff
> ooo/trunk/l10n -- all the language stuff
>
> I removed the .Hg directories before proceeding, so I had a clean local copy.
>
> I then created a local SVN repository, enabled auto-props to get the
> proper EOL treatment and imported the project:
>
> svn import c:\merged file:///c:/svn-repo/ -m "initial import"

a potential issue when doing the import on windows is that the execute 
bit of the files may get lost (i think windows filesystems don't support 
that natively).

this could perhaps work by using Cygwin tools (Hg and SVN), because 
Cygwin has to emulate it somehow anyway.

or of course it could be fixed later, there shouldn't be many files that 
need it...

regards,
  michael