Ok, woah. that's really weird... note the strange behaviour of git-clean (i had my ide open, then clossed it. but it still acted strange) that seems to have got it. so are you going to apply that patch to git proper? stubbsa@VFNZV95336 /cygdrive/c/dev $ git --version git version 1.5.6.4 stubbsa@VFNZV95336 /cygdrive/c/dev $ git svn rebase --dry-run Remote Branch: refs/remotes/git-svn SVN URL: http://10.107.6.150/repos/portal/oasis/branches/oasis-cr stubbsa@VFNZV95336 /cygdrive/c/dev $ git rebase git-svn First, rewinding head to replay your work on top of it... error: Untracked working tree file 'webnonline-db-access/target/hanson-db-access-1.0.jar' would be overwritten by merge. could not detach HEAD stubbsa@VFNZV95336 /cygdrive/c/dev $ git clean -df Removing .temp/ Removing Libraries/release/ Removing SiebelJavaInterface/release/ Removing SiebelJavaInterface/src/generated/ Removing SiebelJavaInterface/tmp/ Removing Utilities/.apt_src/ Removing Utilities/build/ Removing VFSecurityProviders/build/ Removing VFSecurityProviders/vfSecurityProviders.jar Removing VFSecurityProviders/vfSecurityProviders_r1_00_01.jar stubbsa@VFNZV95336 /cygdrive/c/dev $ git rebase git-svn First, rewinding head to replay your work on top of it... error: Untracked working tree file 'webnonline-db-access/target/hanson-db-access-1.0.jar' would be overwritten by merge. could not detach HEAD stubbsa@VFNZV95336 /cygdrive/c/dev $ git clean -df Removing Utilities/.apt_src/ Removing Utilities/build/ stubbsa@VFNZV95336 /cygdrive/c/dev $ git clean -df Removing Utilities/.apt_src/ Removing Utilities/build/ stubbsa@VFNZV95336 /cygdrive/c/dev $ git clean -df stubbsa@VFNZV95336 /cygdrive/c/dev $ git rebase git-svn First, rewinding head to replay your work on top of it... error: Untracked working tree file 'webnonline-db-access/target/hanson-db-access-1.0.jar' would be overwritten by merge. could not detach HEAD <manually deleted "untracked file" here> stubbsa@VFNZV95336 /cygdrive/c/dev $ git rebase git-svn First, rewinding head to replay your work on top of it... Applying removed generated files Applying Changed maven call method Applying Switched dependency to project from jar Applying Added dependency build Applying Updated notification service build target 2008/8/7 Junio C Hamano <gitster@xxxxxxxxx>: > "Tony Stubbs" <antony.stubbs@xxxxxxxxx> writes: > >> $ git svn rebase >> First, rewinding head to replay your work on top of it... >> could not detach HEAD >> rebase refs/remotes/git-svn: command returned error: 1 > > It is somewhat unfortunate that git-svn does not say anything about what > ref it is trying to rebase onto here. I do not use git-svn nor know much > about the code myself, but here are some ideas. > > * Try "rebase --dry-run" and see what you see from this part of the code: > > sub cmd_rebase { > ... > if ($_dry_run) { > print "Remote Branch: " . $gs->refname . "\n"; > print "SVN URL: " . $url . "\n"; > return; > } > > Most interesting is what $gs->refname is; > > * If you are using recent enough git (I think 1.5.2 is Ok), update your > copy of git-rebase like this, so that you would at least see *why* you > cannot detach HEAD. It is possible that git-svn is giving a nonsense > ref to detach to. > > diff --git a/git-rebase.sh b/git-rebase.sh > index e2d85ee..7825f88 100755 > --- a/git-rebase.sh > +++ b/git-rebase.sh > @@ -376,9 +376,7 @@ fi > > # Detach HEAD and reset the tree > echo "First, rewinding head to replay your work on top of it..." > -git checkout "$onto^0" >/dev/null 2>&1 || > - die "could not detach HEAD" > -# git reset --hard "$onto^0" > +git checkout -q "$onto^0" || die "could not detach HEAD" > > # If the $onto is a proper descendant of the tip of the branch, then > # we just fast forwarded. > -- ___________________________ http://stubbisms.wordpress.com/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
