[prev in list] [next in list] [prev in thread] [next in thread] 

List:       gcc
Subject:    Re: git-svn error due to out-of-sync changes?
From:       Markus Trippelsdorf <markus () trippelsdorf ! de>
Date:       2017-05-23 9:39:11
Message-ID: 20170523093911.GA2452 () x4
[Download RAW message or body]

On 2017.05.23 at 05:26 -0400, Aldy Hernandez wrote:
> Jason Merrill <jason@redhat.com> writes:
> 
> > Yes, the git mirror can lag the SVN repo by a few minutes, that's why
> > you need to 'git svn rebase' to pull directly from SVN before a
> > commit.
> >
> > Jason
> 
> Markus just said upthread that:
> 
> "git svn dcommit" will run "git svn rebase" automatically
> 
> Is `git svn rebase' run automatically or from `git svn dcommit' or not?
> I'm trying to save keystrokes here :).

`git svn rebase' is run automatically _after_ "git svn dcommit".
So to minimize potential conflicts, it is a good idea to run "svn
rebase" before committing.

-- 
Markus
[prev in list] [next in list] [prev in thread] [next in thread]