From: Benoit Daloze <eregontp@...>
Date: 2014-02-07T16:32:41+01:00
Subject: [ruby-core:60563] Re: trunk history discontinuity on git mirror?

--089e011844dabdab4f04f1d2b597
Content-Type: text/plain; charset=ISO-8859-1

On 6 February 2014 20:22, Eric Wong <normalperson@yhbt.net> wrote:

> It looks like some commits had svn.ruby-lang.org in the git-svn-id:
> line in the past, and all of those got corrected to ci.ruby-lang.org
> otherwise, I think history looks intact.
>
> I just needed to stop and verify there wasn't anything wrong with the
> repo (there doesn't appear to be).
>
> In retrospect, having the full URL in git-svn commit messages
> was probably a mistake.  Too late to change now, though :/
>

So we do actually need to have svn@ci.ruby-lang.org as the svn-remote url,
otherwise we get a merge conflict on pull.
(That is, the mail from Hiroshi is incorrect in this regard, we need to
revert it for those who changed: "I revert DNS change today. If you already
switch svn.ruby-lang.org from ci.ruby-lang.org. You don't need to revert
it.")

`git svn rebase` seems enough to fix the situation after changing the
svn-remote url.

--089e011844dabdab4f04f1d2b597
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div><div class=3D"gmail_extra"><div class=3D"gmail_quote"=
>On 6 February 2014 20:22, Eric Wong <span dir=3D"ltr">&lt;<a href=3D"mailt=
o:normalperson@yhbt.net" target=3D"_blank">normalperson@yhbt.net</a>&gt;</s=
pan> wrote:<br>

<blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-=
left:1px solid rgb(204,204,204);padding-left:1ex">It looks like some commit=
s had <a href=3D"http://svn.ruby-lang.org" target=3D"_blank">svn.ruby-lang.=
org</a> in the git-svn-id:<br>


line in the past, and all of those got corrected to <a href=3D"http://ci.ru=
by-lang.org" target=3D"_blank">ci.ruby-lang.org</a><br>
otherwise, I think history looks intact.<br>
<br>
I just needed to stop and verify there wasn&#39;t anything wrong with the<b=
r>
repo (there doesn&#39;t appear to be).<br>
<br>
In retrospect, having the full URL in git-svn commit messages<br>
was probably a mistake. =A0Too late to change now, though :/<br>
</blockquote></div><br><div>So we do actually need to have <a href=3D"mailt=
o:svn@ci.ruby-lang.org">svn@ci.ruby-lang.org</a> as the svn-remote url, oth=
erwise we get a merge conflict on pull.<br></div><div>(That is, the mail fr=
om Hiroshi is incorrect in this regard, we need to revert it for those who =
changed: &quot;I revert DNS change today. If you already switch <a href=3D"=
http://svn.ruby-lang.org" target=3D"_blank">svn.ruby-lang.org</a>
from <a href=3D"http://ci.ruby-lang.org" target=3D"_blank">ci.ruby-lang.org=
</a>. You don&#39;t need to revert it.&quot;)</div><div><br></div>`git svn =
rebase` seems enough to fix the situation after changing the svn-remote url=
.<br>

</div></div></div>

--089e011844dabdab4f04f1d2b597--