Return-Path: X-Original-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 781A28AFD for ; Tue, 16 Aug 2011 12:32:59 +0000 (UTC) Received: (qmail 78502 invoked by uid 500); 16 Aug 2011 12:32:59 -0000 Delivered-To: apmail-incubator-ooo-dev-archive@incubator.apache.org Received: (qmail 76788 invoked by uid 500); 16 Aug 2011 12:32:54 -0000 Mailing-List: contact ooo-dev-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-dev@incubator.apache.org Received: (qmail 76780 invoked by uid 99); 16 Aug 2011 12:32:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 16 Aug 2011 12:32:52 +0000 X-ASF-Spam-Status: No, hits=-0.0 required=5.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of apache@robweir.com designates 69.89.24.6 as permitted sender) Received: from [69.89.24.6] (HELO oproxy9.bluehost.com) (69.89.24.6) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 16 Aug 2011 12:32:43 +0000 Received: (qmail 28398 invoked by uid 0); 16 Aug 2011 12:32:21 -0000 Received: from unknown (HELO host181.hostmonster.com) (74.220.207.181) by oproxy9.bluehost.com with SMTP; 16 Aug 2011 12:32:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=robweir.com; s=default; h=Content-Transfer-Encoding:Content-Type:To:From:Subject:Message-ID:Date:References:In-Reply-To:MIME-Version; bh=N3VdzIj/NWFBXB1YiO89/Fi+Cqoac5j9Dx/z6hn6s+s=; b=W+JHGEvETTQ6DnQVLaFRSOTAnrMnF8gq4E21MX4r/AtlkDtLm2UlEC22JLV1ISB354rwcqPkyyTa1lUG7d5DcYzKPd2c9FlVL6AWuvEiYtHlXyFAT4qoBrqpwSIuobhA; Received: from mail-gy0-f175.google.com ([209.85.160.175]) by host181.hostmonster.com with esmtpsa (TLSv1:RC4-SHA:128) (Exim 4.76) (envelope-from ) id 1QtIof-00071a-2m for ooo-dev@incubator.apache.org; Tue, 16 Aug 2011 06:32:21 -0600 Received: by gyg4 with SMTP id 4so3668680gyg.6 for ; Tue, 16 Aug 2011 05:32:20 -0700 (PDT) MIME-Version: 1.0 Received: by 10.42.148.71 with SMTP id q7mr797652icv.172.1313497940075; Tue, 16 Aug 2011 05:32:20 -0700 (PDT) Received: by 10.42.220.135 with HTTP; Tue, 16 Aug 2011 05:32:19 -0700 (PDT) In-Reply-To: <4E4A104D.8090905@gmx.net> References: <4E4A104D.8090905@gmx.net> Date: Tue, 16 Aug 2011 08:32:19 -0400 Message-ID: Subject: Re: [Repo][Proposal] OOO340 SVN Dump file import From: Rob Weir To: ooo-dev@incubator.apache.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Identified-User: {1114:host181.hostmonster.com:robweirh:robweir.com} {sentby:smtp auth 209.85.160.175 authed with apache@robweir.com} X-Virus-Checked: Checked by ClamAV on apache.org On Tue, Aug 16, 2011 at 2:38 AM, Mathias Bauer wrot= e: > On 15.08.2011 23:48, Michael Stahl wrote: > >> 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. =C2=A0Either 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. =C2=A0I've made some progress on this proposal. >> >> very good! >> >>> Here's what I did. =C2=A0I'd like some review, to make sure I didn't sc= rew >>> anything up. I am neither an Hg nor a SVN expert. =C2=A0But 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). > > Ah, yes, that's a good point. From past experience I don't recommend > doing any critical work on OOo repositories on Windows. Even cygwin is > just a crudge and there are many pitfalls. As this should be the base > work for the new project we definitely should take no risk here and do > the import and create the svn dump on Linux or Mac OSX. > I've uploaded the dump file. There are no abstract, non-specific risks there. There may be errors. But those would be the kind of errors that could be described in detail. And they may be the kind of errors that could be easily fixed. But we won't know until someone reviews the dump file. I could certainly repeat the steps on Linux, but that does not eliminate risk from misusing hg, svn or any other source of human error. We'll need to do more than poke a stick at the dump file to really understand what is in there. Is anyone planning on actually reviewing the dump file, e.g., loading it into a local repository, checking it out and looking at the resulting source tree? > Regards, > Mathias >