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 did
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
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,
This
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
Jakub Jelinek wrote:
Yes. I think they are useful for all branches if you backport a patch for
a particular fix or e.g. fix something that is not yet fixed on the trunk
and will be only when a particular devel branch with that fix is merged
into trunk. But in all cases that should be a sing
On Thu, Jan 12, 2006 at 11:12:36AM +0100, Giovanni Bajo wrote:
> Bernd Schmidt <[EMAIL PROTECTED]> wrote:
>
> >> mysql> delete from longdescs where length(thetext) > 100;
> >> Query OK, 251 rows affected (2 min 12.11 sec)
> >
> > Thank you.
> >
> >> I may just set up a pre-commit hook to che
Bernd Schmidt <[EMAIL PROTECTED]> wrote:
>> mysql> delete from longdescs where length(thetext) > 100;
>> Query OK, 251 rows affected (2 min 12.11 sec)
>
> Thank you.
>
>> I may just set up a pre-commit hook to check the log message length and
>> hav eit not let you commit if it's ridiculousl
Daniel Berlin wrote:
mysql> delete from longdescs where length(thetext) > 100;
Query OK, 251 rows affected (2 min 12.11 sec)
Thank you.
I may just set up a pre-commit hook to check the log message length and
hav eit not let you commit if it's ridiculously large.
Maybe checkins on a bran
On Thu, 2006-01-12 at 00:55 +0100, Bernd Schmidt wrote:
> Daniel Berlin wrote:
> > On Wed, 11 Jan 2006, Bernd Schmidt wrote:
> >> The merge script relies only on the svnmerge-integrated property, not
> >> on the commit messages?
> >
> >
> > Right.
> >
> > It's just trying to generate a nice mes
Daniel Berlin wrote:
On Wed, 11 Jan 2006, Bernd Schmidt wrote:
The merge script relies only on the svnmerge-integrated property, not
on the commit messages?
Right.
It's just trying to generate a nice message for you, but in our world,
the messages are so huge as to be useless.
I've fixed
On Wed, 11 Jan 2006, Bernd Schmidt wrote:
Joern RENNECKE wrote:
Your merges are spamming the bugzilla database and anybody who is on the CC
list of the affected bugs.
both 20470 and 19199 got 1.2 Megabytes of ChangeLog.
Argh. That's a side effect of the merge script I wasn't expecting. Wh
On Wed, 11 Jan 2006, Bernd Schmidt wrote:
Giovanni Bajo wrote:
Bernd Schmidt <[EMAIL PROTECTED]> wrote:
Your merges are spamming the bugzilla database and anybody who is on
the CC list of the affected bugs.
both 20470 and 19199 got 1.2 Megabytes of ChangeLog.
Argh. That's a side effect
12 matches
Mail list logo
