#!/bin/sh

# Do not warn if there were no real merge
git rev-parse -q --verify HEAD^2 >/dev/null || exit

echo
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo "! You probably used 'git pull' instead of 'git pull -r' !"
echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
echo
echo "You can still fix it - please do 'git pull -r' now."
echo
id=02a536fa7642b01fb486f69a18c2e509702a5db0'/>
<id>02a536fa7642b01fb486f69a18c2e509702a5db0</id>
<content type='text'>
Change-Id: I9e8672e92648359ff8ec7e3f7b667e785b51f0d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169602
Reviewed-by: Taichi Haradaguchi &lt;20001722@ymail.ne.jp&gt;
Tested-by: Jenkins
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change-Id: I9e8672e92648359ff8ec7e3f7b667e785b51f0d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169602
Reviewed-by: Taichi Haradaguchi &lt;20001722@ymail.ne.jp&gt;
Tested-by: Jenkins
</pre>
</div>
</content>
</entry>
<entry>
<title>replace stock button labels</title>
<updated>2021-01-15T11:43:22+00:00</updated>
<author>
<name>Caolán McNamara</name>
<email>caolanm@redhat.com</email>
</author>
<published>2021-01-11T16:17:32+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=9100d70e1deeefd652c70d8086c01fe55742c3f0'/>
<id>9100d70e1deeefd652c70d8086c01fe55742c3f0</id>
<content type='text'>
Change-Id: I726ba7846322863d9f38314b6c6ccc7f71124a0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109197
Tested-by: Jenkins
Reviewed-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
Change-Id: I726ba7846322863d9f38314b6c6ccc7f71124a0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109197
Tested-by: Jenkins
Reviewed-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>tdf#138848 add truncate-multiline to all GtkEntries and GtkSpinButtons</title>
<updated>2021-01-15T09:10:14+00:00</updated>
<author>
<name>Caolán McNamara</name>
<email>caolanm@redhat.com</email>
</author>
<published>2021-01-14T15:42:05+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=f89b94c280e8d986cdf08271f5cdc6b1dfe09575'/>
<id>f89b94c280e8d986cdf08271f5cdc6b1dfe09575</id>
<content type='text'>
except for extensions/uiconfig/spropctrlr/ui/multiline.ui

Change-Id: Ia2eca14332ffd4ac6e277c7529f17eca3ba29c0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109310
Tested-by: Jenkins
Reviewed-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
except for extensions/uiconfig/spropctrlr/ui/multiline.ui

Change-Id: Ia2eca14332ffd4ac6e277c7529f17eca3ba29c0e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109310
Tested-by: Jenkins
Reviewed-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>add &lt;!-- n-columns=1 n-rows=1 --&gt; before every GtkGrid</title>
<updated>2020-11-15T19:14:10+00:00</updated>
<author>
<name>Caolán McNamara</name>
<email>caolanm@redhat.com</email>
</author>
<published>2020-11-14T21:19:30+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=15377223043d4430ebf49eefe0f00a736908d02d'/>
<id>15377223043d4430ebf49eefe0f00a736908d02d</id>
<content type='text'>
for a in `git ls-files '*.ui'`; do sed -i 's/^\( *\)\(&lt;object class="GtkGrid".*\)/\1&lt;!-- n-columns=1 n-rows=1 --&gt;\n\1\2/' $a; done

so we get the same behavior in glade as before 3.38 in that the grid preview
don't show any unoccupied grid squares

replace all existing n-columns=X n-rows=Y lines because they are
all wrong, except for
cui/uiconfig/ui/additionsfragment.ui
sw/uiconfig/swriter/ui/pageheaderpanel.ui
sw/uiconfig/swriter/ui/pagefooterpanel.ui
which are correct.

Change-Id: I401bbe8e098c26e7f57d6a872d3b70fc1ce85a00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105846
Tested-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
Reviewed-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
for a in `git ls-files '*.ui'`; do sed -i 's/^\( *\)\(&lt;object class="GtkGrid".*\)/\1&lt;!-- n-columns=1 n-rows=1 --&gt;\n\1\2/' $a; done

so we get the same behavior in glade as before 3.38 in that the grid preview
don't show any unoccupied grid squares

replace all existing n-columns=X n-rows=Y lines because they are
all wrong, except for
cui/uiconfig/ui/additionsfragment.ui
sw/uiconfig/swriter/ui/pageheaderpanel.ui
sw/uiconfig/swriter/ui/pagefooterpanel.ui
which are correct.

Change-Id: I401bbe8e098c26e7f57d6a872d3b70fc1ce85a00
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105846
Tested-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
Reviewed-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>set all .ui min require version of gtk to 3.20</title>
<updated>2020-10-22T20:27:50+00:00</updated>
<author>
<name>Caolán McNamara</name>
<email>caolanm@redhat.com</email>
</author>
<published>2020-10-22T16:26:58+00:00</published>
<link rel='alternate' type='text/html' href='https://go.suokunlong.cn:88/cgit/lo/core/commit/?id=3b3c181e5010c7b1ef6f82f23101ce45f7f0a621'/>
<id>3b3c181e5010c7b1ef6f82f23101ce45f7f0a621</id>
<content type='text'>
and update the version mentioned in our min req in the readme.xrm

follow up to

commit 0c9ccc7dbf6deb4d012e0d1e6eb934e54e0f19bc
Author: Caolán McNamara &lt;caolanm@redhat.com&gt;
Date:   Fri Oct 2 21:21:45 2020 +0100

    raise min version of gtk to 3.20.0

Change-Id: Ibae55c97e1ee577f4b7435d124cda6a21005ad0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104692
Tested-by: Jenkins
Reviewed-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
and update the version mentioned in our min req in the readme.xrm

follow up to

commit 0c9ccc7dbf6deb4d012e0d1e6eb934e54e0f19bc
Author: Caolán McNamara &lt;caolanm@redhat.com&gt;
Date:   Fri Oct 2 21:21:45 2020 +0100

    raise min version of gtk to 3.20.0

Change-Id: Ibae55c97e1ee577f4b7435d124cda6a21005ad0c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104692
Tested-by: Jenkins
Reviewed-by: Caolán McNamara &lt;caolanm@redhat.com&gt;
</pre>
</div>
</content>
</entry>