Nathaniel McCallum <npmccallum(a)redhat.com> wrote
Fri, 27 May 2011 09:49:10 -0400:
| As far as git is concerned, this problem arises due to the evolutionary
| nature of git-svn which means that different versions of git-svn create
| different "versions" of history which then cannot be merged/rebased on.
That explains things. Thanks!
| The second approach is to use git replace to establish a common root.
Seems like that worked out for me. I forked your repo on github and
added that as a new remote ("github"). Then I replaced and pulled like
so:
git replace f5f17196 53b83e4f
git pull --rebase github AuthHub
Pushed this to branch otp-wip of ln5/krb5-anonsvn at github.
Thanks for the help and let me know if there's anything unclear about my
patches. Both available methods have been smoke tested
method OTP generator OTP validator
--------------------------------------------------
basicauth oathtool[0] mod_authn_otp + Apache
ykclient YubiKey[1] YubiServe[2]
[0] from oath-toolkit
[1] physical key in YubiKey mode
[2] yubico-yubiserve-3.1