To answer some questions I got off-list, it looks like this wasn't
quite sufficient.
git-svn still caches the old hashes and will be confused. It's safe*
to "rm -rf .git/svn/" and then try something like "git svn find-rev
r18522" just to verify it rebuilds its index.
To completely clobber a checkout or a branch, you can do one of:
- git checkout -b someotherbranch origin; git branch -D mybranch
- git reset --hard origin # clobbers current branch
If you have changes you want to transplant, your best bet is probably
saving them as a patch :\. See "git help format-patch" to construct
them and "git help am" to apply them.
(* I believe it's not safe if you have fancy settings like
useSvmProps, but if you're doing that then you should probably
understand how git-svn works.)
On Wed, Jun 17, 2009 at 12:09 AM, Evan Martin<e...@chromium.org> wrote:
> I'm not sure why, but the git.chromium.org repo was getting some
> checksum failures. It stopped updating around 6pm PDT.
>
> I rewound it a bit and restarted its mirroring, and it seems to be ok
> now, but you'll find the hashes have changed from around r18522.
> I think if you do an ordinary "git merge" it will be able to figure
> out that the data is the same on either side of the fork.
>
> Please contact me directly if you run into anything weird.
>
--~--~---------~--~----~------------~-------~--~----~
Chromium Developers mailing list: chromium-dev@googlegroups.com
View archives, change email options, or unsubscribe:
http://groups.google.com/group/chromium-dev
-~----------~----~----~----~------~----~------~--~---
