This is the mail archive of the
mailing list for the GCC project.
Re: git-svn error due to out-of-sync changes?
On 2017.05.18 at 12:41 -0600, Martin Sebor wrote:
> On 05/18/2017 11:59 AM, Jeff Law wrote:
> > On 05/18/2017 11:41 AM, Martin Sebor wrote:
> > > I just tried to push a change and got the error below. git
> > > pull says my tree is up to date. I wonder if it's caused by
> > > my commit conflicting with another commit (in this case
> > > r248244) that git-svn doesn't see because it lags behind SVN.
> > > I brushed this (and other strange errors) off before, not
> > > bothering to try to understand it but it's happened enough
> > > times that I'd like to bring it up. I expect some (maybe
> > > even most) of these issues would not exist if we were using
> > > Git directly rather than the git-svn wrapper. Has any more
> > > progress been made on the Git integration project? Is there
> > > something I/we can do to help get it done?
> > That just means something changed upstream betwen your last git svn
> > rebase and your local commit.
> > Just "git svn rebase", resolve conflicts (the ChangeLogs are the most
> > common source of conflicts) and you should be good to go.
> The main issue is that there tend to be errors that wouldn't
> happen without the extra layer between Git and SVN. The two
> are out of sync by minutes (I don't know exactly how many but
> it seems like at least 10), so clearing these things up takes
> time. Some (I'd say most) of the errors I've seen out of
> Git-svn are also not completely intuitive so it's not always
> clear what or where the problem is.
> So I'd like to see if there's something that can be done to
> move the migration forward.
The same issue also happen with git when several people push at the same