Re: Merges from release branches to vendor tracking branches

2020-01-24 Thread Jonathan Wakely
On Thu, 23 Jan 2020 at 23:15, Peter Bergner 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

Re: Merges from release branches to vendor tracking branches

2020-01-23 Thread Peter Bergner
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

Re: Merges from release branches to vendor tracking branches

2020-01-23 Thread Peter Bergner
On 1/23/20 4:29 AM, Jakub Jelinek wrote: > Just FYI if somebody needs to do something similar, I needed to do a merge > from origin/releases/gcc-9 to our vendor branch - > refs/vendors/redhat/heads/gcc-9-branch > This branch has some extra commits origin/releases/gcc-9 branch doesn't > have,

Re: Merges from release branches to vendor tracking branches

2020-01-23 Thread Joseph Myers
On Thu, 23 Jan 2020, Jakub Jelinek wrote: > Just FYI if somebody needs to do something similar, I needed to do a merge > from origin/releases/gcc-9 to our vendor branch - > refs/vendors/redhat/heads/gcc-9-branch > This branch has some extra commits origin/releases/gcc-9 branch doesn't > have, so

Merges from release branches to vendor tracking branches

2020-01-23 Thread Jakub Jelinek
Hi! Just FYI if somebody needs to do something similar, I needed to do a merge from origin/releases/gcc-9 to our vendor branch - refs/vendors/redhat/heads/gcc-9-branch This branch has some extra commits origin/releases/gcc-9 branch doesn't have, so it is not a fast forward merge and we have the