From mboxrd@z Thu Jan 1 00:00:00 1970 From: magnuspalmer Subject: Migrating from subversion via git svn contains log entry, but not the file change in the branch. Date: Mon, 3 May 2010 05:25:36 -0700 (PDT) Message-ID: <1272889536578-4997493.post@n2.nabble.com> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Mon May 03 14:25:48 2010 connect(): No such file or directory Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1O8uiY-0007j0-87 for gcvg-git-2@lo.gmane.org; Mon, 03 May 2010 14:25:46 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758492Ab0ECMZj convert rfc822-to-quoted-printable (ORCPT ); Mon, 3 May 2010 08:25:39 -0400 Received: from kuber.nabble.com ([216.139.236.158]:40183 "EHLO kuber.nabble.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758304Ab0ECMZi convert rfc822-to-8bit (ORCPT ); Mon, 3 May 2010 08:25:38 -0400 Received: from jim.nabble.com ([192.168.236.80]) by kuber.nabble.com with esmtp (Exim 4.63) (envelope-from ) id 1O8uiO-0004zu-JH for git@vger.kernel.org; Mon, 03 May 2010 05:25:36 -0700 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: I've been working almost fulltime for two weeks migrating a subversion repository to git. Most repos go fine, but some doesn't and I'm running out of options. Been trying to find posts regarding this and tried what I've found. The subversion repo contains subrepos. Layout is this: tags branches subrepo-a(with standard layout: trunk, tags, branches) subrepo-n Team is doing ongoing development in currently four branches (develop, release-product-a-1.1, release-product-b-1.0, trunk). I'll deal with th= at later. What happends is that I get the svn log message, but the file is not th= e correct one, or the file is completely missing suddenly. git checkout develop HEAD is now at 5269d17... increased version to 1.2.0-SNAPSHOT. The change in the file is not there, the old version number in the pom.= xml. I compare this with the one checkout out via svn. git svn init --trunk=3D'' --tags=3Dtags/*/* --branches=3Dbranches --pre= fix=3Dsvn/ --ignore-paths=3D"branches|tags|subrepo-a|subrepo-b|" https://example.com/svn/theproject/client Then I've tried: git fetch git fetch --no-follow-parent turn on/off brokensymlink workaround git config svn.brokenSymlinkWorkaround false git config svn.brokenSymlinkWorkaround true Also started at different revisions -r XYZ:HEAD =46or one of the cases (with svn.brokenSymlinkWorkaround=3Dfalse) I get= : =46ound possible branch point: https://example.com/svn/theproject/client/branches/develop/pom.xml =3D> https://example.com/svn/theproject/client/branches/release-1.1.0, 10623 Initializing parent: release-1.1.0@10623 W: Ignoring error from SVN, path probably does not exist: (160013): =46ilesystem has no item: File not found: revision 6973, path '/theproject/client/branches/develop/pom.xml' And I end up with a: remotes/release-1.1.0 remotes/release-1.1.0@10623 Any ideas of how to proceed? I am getting short out of ideas. /Magnus Palm=C3=A9r /Magnus Palm=C3=A9r --=20 View this message in context: http://git.661346.n2.nabble.com/Migrating= -from-subversion-via-git-svn-contains-log-entry-but-not-the-file-change= -in-the-branch-tp4997493p4997493.html Sent from the git mailing list archive at Nabble.com.