This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: Merges from release branches to vendor tracking branches


On Thu, 23 Jan 2020 at 23:15, Peter Bergner <bergner@linux.ibm.com> wrote:
>
> On 1/23/20 12:09 PM, Peter Bergner wrote:
> > On 1/23/20 4:29 AM, Jakub Jelinek wrote:
> >> so it is not a fast forward merge and we have the requirement that
> >> From-SVN: shouldn't appear in commit logs of new commits.
> >
> > So I just did "git merge releases/gcc-9" into our branch and I'm not
> > seeing any From-SVN: in any of the commit messages.  Where/how are
> > you seeing those?
>
> Actually, I see them now.  I'm not sure what happened before.
>
> So Joseph said these are actually ok on the vendor branches,
> but what was the original concern with them being there in the
> commit logs?

We don't want a commit that has been cherry-picked onto a branch (and
possibly edited to resolve conflicts) to have "From-SVN" in the log,
because that would confuse various scripts into thinking that your new
commit on the branch *is* the commit imported from SVN. If it's a
different commit, it shouldn't have the From-SVN marker from the
original commit.

Only commits  that actually came from SVN should say From-SVN in their logs.

>  Is it still useful to remove them?

If the hooks don't reject it, I'd say no. If the commit really *is* a
merge commit, i.e. you do a 'git merge' to add the same commit with
the original hash to your vendor branch, then it's not useful to
remove them. Because in that case it really *is* the commit that was
imported from SVN (and removing the From-SVN would just alter the
commit and give it a different hash, so now it would be a different
commit, for no good reason).


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]