Re: Rewriting git history during git-svn conversion

2014-03-06 Thread Robert Dailey
On Tue, Mar 4, 2014 at 4:56 AM, Thomas Ferris Nicolaisen
 wrote:
> On Mon, Mar 3, 2014 at 7:38 PM, Robert Dailey  
> wrote:
>>
>> Is it safe to do this while still using git svn fetch? Will it
>> properly continue to convert SVN commits on top of my rewritten
>> history? If not, what changes can I make after I run the commands
>> linked by the URL above so that git svn continues to work normally?
>>
>
> I think it's OK. git-svn doesn't continuously verify the integrity of
> history already converted, I believe.
>
> Just try it out, it worked fine in a little demo setup I made
> (although I used rebase -i instead of filter-branch):
>
> git svn clone .. #maybe clone a little test repository to speed up the testing
> git filter-branch ... #remove unwanted files
> git svn fetch #this should work
>
> On a related note, maybe you'll enjoy my git-svn demos & ideas here:
> http://www.tfnico.com/presentations/git-and-subversion


So I did try this out. I did a 'fitler-branch', and afterwards I am
unable to do a `git svn fetch`:

$ git svn fetch
fatal: Invalid revision range cf641cf687fc41b769f296af6e4345dd6a8a6d7d
rev-list --pretty=raw --reverse
cf641cf687fc41b769f296af6e4345dd6a8a6d7d..refs/remotes/svn/trunk --:
command returned error: 128

I have a TON of branches, so I need some small command or script that
is able to go through each branch and update the metadata to tell it
what the new (rewritten) HEAD commit on each branch is. I'm assuming
that's the problem (git svn data is referring to old SHA of each
remote tracking branch).

If there is more to it than this please let me know. Thanks so far for
everyone's help.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: Rewriting git history during git-svn conversion

2014-03-04 Thread Thomas Ferris Nicolaisen
On Mon, Mar 3, 2014 at 7:38 PM, Robert Dailey  wrote:
>
> Is it safe to do this while still using git svn fetch? Will it
> properly continue to convert SVN commits on top of my rewritten
> history? If not, what changes can I make after I run the commands
> linked by the URL above so that git svn continues to work normally?
>

I think it's OK. git-svn doesn't continuously verify the integrity of
history already converted, I believe.

Just try it out, it worked fine in a little demo setup I made
(although I used rebase -i instead of filter-branch):

git svn clone .. #maybe clone a little test repository to speed up the testing
git filter-branch ... #remove unwanted files
git svn fetch #this should work

On a related note, maybe you'll enjoy my git-svn demos & ideas here:
http://www.tfnico.com/presentations/git-and-subversion
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html