So, my repo is in a weird state. I have committed my changes to svn
via git svn dcommit, and it appears that the svn repository has all my
changes.
However, git svn rebase fails with conflicts, on almost every single
commit I've made. I think that ultimately, I merged a branch in
numerous times and git seems confused. BUT, I don't really care about
preserving that; I just want my master branch to be clean.
Is there a way I can basically say: commit XXX is the same as the
current HEAD of SVN, so treat things as if that's the case. i.e.
treat things the same as if I had just done a clean git svn clone.
On Monday 2008 December 29 15:39:45 davetron5000 wrote:
Is there a way I can basically say: commit XXX is the same as the
current HEAD of SVN, so treat things as if that's the case.
No, commits are immutable and their "name" is based on their contents.
However, if you've fetched the current HEAD of SVN, you've already got a
commit that corresponds (roughly) to the HEAD of SVN.
i.e.
treat things the same as if I had just done a clean git svn clone.
On my git-svn created repository, I have a special ref "git-svn" that appears
to refer to the "HEAD of SVN" commit. ("git branch -a" shows it.) If that's
also the case with you:
git branch -m master master.save
git checkout -b master git-svn
# Make sure you are seeing what you want.
git branch -D master.save
should get you to where you want.
Heck, "git reset git-svn" might work.
--
Boyd Stephen Smith Jr. ,= ,-_-. =.
bss@iguanasuicide.net ((_/)o o(\_))
ICQ: 514984 YM/AIM: DaTwinkDaddy `-'(. .)`-'
http://iguanasuicide.net/ \_/
On Mon, Dec 29, 2008 at 13:39, davetron5000 [off-list ref] wrote:
So, my repo is in a weird state. I have committed my changes to svn
via git svn dcommit, and it appears that the svn repository has all my
changes.
However, git svn rebase fails with conflicts, on almost every single
commit I've made. I think that ultimately, I merged a branch in
numerous times and git seems confused. BUT, I don't really care about
preserving that; I just want my master branch to be clean.
Is there a way I can basically say: commit XXX is the same as the
current HEAD of SVN, so treat things as if that's the case. i.e.
treat things the same as if I had just done a clean git svn clone.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
git checkout local-branch-you-want-to-fix
git reset --hard name-of-your-git-svn-branch (probably trunk, or
<prefix>/trunk, if you setup git-svn with the --prefix=<prefix>/
option).
This will wipe out anything you have in local-branch-you-want-to-fix,
and reset it to the same state that name-of-your-git-svn-branch is in.
-Jacob