Re: [Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

classic Classic list List threaded Threaded
7 messages Options
Ivan Timofeev Ivan Timofeev
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

On 23.10.2012 22:45, Libreoffice Gerrit user wrote:

> commit 1a53b377d8423b1d214f0cbeacc98b0e9afe81c2
> Author: Michael Stahl <[hidden email]>
> Date:   Tue Oct 23 20:07:10 2012 +0200
>
>     dictionaries
>    
>     Change-Id: I6c909d2cc643c77b0d7d3ee0d426d42c9cafce83
>
> diff --git a/dictionaries b/dictionaries
> index a5162a2..c918f1d 160000
> --- a/dictionaries
> +++ b/dictionaries
> @@ -1 +1 @@
> -Subproject commit a5162a210e3ff07e44307dbf60717d5d5a40608d
> +Subproject commit c918f1d4242d9fd9a8de284e6b32b8c00e59debe

hmm, there is no c918f1:

$ git submodule update
fatal: reference is not a tree: c918f1d4242d9fd9a8de284e6b32b8c00e59debe
Unable to checkout 'c918f1d4242d9fd9a8de284e6b32b8c00e59debe' in
submodule path 'dictionaries'

what does that mean?
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Michael Stahl-2 Michael Stahl-2
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

On 23/10/12 21:28, Ivan Timofeev wrote:

> On 23.10.2012 22:45, Libreoffice Gerrit user wrote:
>> commit 1a53b377d8423b1d214f0cbeacc98b0e9afe81c2
>> Author: Michael Stahl <[hidden email]>
>> Date:   Tue Oct 23 20:07:10 2012 +0200
>>
>>     dictionaries
>>    
>>     Change-Id: I6c909d2cc643c77b0d7d3ee0d426d42c9cafce83
>>
>> diff --git a/dictionaries b/dictionaries
>> index a5162a2..c918f1d 160000
>> --- a/dictionaries
>> +++ b/dictionaries
>> @@ -1 +1 @@
>> -Subproject commit a5162a210e3ff07e44307dbf60717d5d5a40608d
>> +Subproject commit c918f1d4242d9fd9a8de284e6b32b8c00e59debe
>
> hmm, there is no c918f1:
>
> $ git submodule update
> fatal: reference is not a tree: c918f1d4242d9fd9a8de284e6b32b8c00e59debe
> Unable to checkout 'c918f1d4242d9fd9a8de284e6b32b8c00e59debe' in
> submodule path 'dictionaries'
>
> what does that mean?

it means i should RTFM more and rely less on git to do the right thing,
which is apparently beyond its abilities :)

pushed that c918f1d4242d9fd9a8de284e6b32b8c00e59debe manually now...

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Ivan Timofeev Ivan Timofeev
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

On 23.10.2012 23:43, Michael Stahl wrote:

> On 23/10/12 21:28, Ivan Timofeev wrote:
>> On 23.10.2012 22:45, Libreoffice Gerrit user wrote:
>>> commit 1a53b377d8423b1d214f0cbeacc98b0e9afe81c2
>>> Author: Michael Stahl <[hidden email]>
>>> Date:   Tue Oct 23 20:07:10 2012 +0200
>>>
>>>     dictionaries
>>>    
>>>     Change-Id: I6c909d2cc643c77b0d7d3ee0d426d42c9cafce83
>>>
>>> diff --git a/dictionaries b/dictionaries
>>> index a5162a2..c918f1d 160000
>>> --- a/dictionaries
>>> +++ b/dictionaries
>>> @@ -1 +1 @@
>>> -Subproject commit a5162a210e3ff07e44307dbf60717d5d5a40608d
>>> +Subproject commit c918f1d4242d9fd9a8de284e6b32b8c00e59debe
>>
>> hmm, there is no c918f1:
>>
>> $ git submodule update
>> fatal: reference is not a tree: c918f1d4242d9fd9a8de284e6b32b8c00e59debe
>> Unable to checkout 'c918f1d4242d9fd9a8de284e6b32b8c00e59debe' in
>> submodule path 'dictionaries'
>>
>> what does that mean?
>
> it means i should RTFM more and rely less on git to do the right thing,
> which is apparently beyond its abilities :)
>
> pushed that c918f1d4242d9fd9a8de284e6b32b8c00e59debe manually now...

thanks! Yeah, git behaves strange here... I've found git push
--recurse-submodules=<check|on-demand>, so git is smart enough, just
unconcerned.

Ivan
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
Michael Stahl-2 Michael Stahl-2
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

On 23/10/12 22:13, Ivan Timofeev wrote:
> On 23.10.2012 23:43, Michael Stahl wrote:
>> On 23/10/12 21:28, Ivan Timofeev wrote:
>>> On 23.10.2012 22:45, Libreoffice Gerrit user wrote:

>>> $ git submodule update
>>> fatal: reference is not a tree: c918f1d4242d9fd9a8de284e6b32b8c00e59debe
>>> Unable to checkout 'c918f1d4242d9fd9a8de284e6b32b8c00e59debe' in
>>> submodule path 'dictionaries'
>>>
>>> what does that mean?
>>
>> it means i should RTFM more and rely less on git to do the right thing,
>> which is apparently beyond its abilities :)
>>
>> pushed that c918f1d4242d9fd9a8de284e6b32b8c00e59debe manually now...
>
> thanks! Yeah, git behaves strange here... I've found git push
> --recurse-submodules=<check|on-demand>, so git is smart enough, just
> unconcerned.

thanks, that sounds useful; didn't work for me at first because those
submodules are on a detached head, not the master branch... after
fooling around with git rebase i got my commit on the master branch...

then i tried:

git push --recurse-submodules=on-demand --dry-run

which apparently helpfully already pushed the dictionaries submodule
onto the server, _despite_ the --dry-run :-/


_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
David Tardon David Tardon
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

Hi,

On Tue, Oct 23, 2012 at 11:06:44PM +0200, Michael Stahl wrote:

> On 23/10/12 22:13, Ivan Timofeev wrote:
> > On 23.10.2012 23:43, Michael Stahl wrote:
> >> On 23/10/12 21:28, Ivan Timofeev wrote:
> >>> On 23.10.2012 22:45, Libreoffice Gerrit user wrote:
>
> >>> $ git submodule update
> >>> fatal: reference is not a tree: c918f1d4242d9fd9a8de284e6b32b8c00e59debe
> >>> Unable to checkout 'c918f1d4242d9fd9a8de284e6b32b8c00e59debe' in
> >>> submodule path 'dictionaries'
> >>>
> >>> what does that mean?
> >>
> >> it means i should RTFM more and rely less on git to do the right thing,
> >> which is apparently beyond its abilities :)
> >>
> >> pushed that c918f1d4242d9fd9a8de284e6b32b8c00e59debe manually now...
> >
> > thanks! Yeah, git behaves strange here... I've found git push
> > --recurse-submodules=<check|on-demand>, so git is smart enough, just
> > unconcerned.
>
> thanks, that sounds useful; didn't work for me at first because those
> submodules are on a detached head, not the master branch... after
> fooling around with git rebase i got my commit on the master branch...
>
> then i tried:
>
> git push --recurse-submodules=on-demand --dry-run
>
> which apparently helpfully already pushed the dictionaries submodule
> onto the server, _despite_ the --dry-run :-/

What I do is

git push origin HEAD:master

in the submodule _followed_ by

git push

in core. I admit it could be a bit easier, but I find it good enough for
occasional use.

D.
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
sberg sberg
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

On 10/24/2012 07:45 AM, David Tardon wrote:
> What I do is
>
> git push origin HEAD:master
>
> in the submodule _followed_ by
>
> git push
>
> in core.

The only annoyance with this, AFAIU, is that as soon as you push the
submodule to gerrit.libreoffice.org:29418 it automatically creates a
commit in the core repo on your behalf that updates the submodule SHA
pointer.

So when you have a core commit A and a submodule commit B that logically
belong together, with the above recipe the end result on the server will
no longer reflect that, as it "ties" B to an "artificial" core commit C
preceding A, instead of keeping B "tied" to A.

Stephan
_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice
sberg sberg
Reply | Threaded
Open this post in threaded view
|

Re: [Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

On 10/24/2012 10:10 AM, Stephan Bergmann wrote:
> The only annoyance with this, AFAIU, is that as soon as you push the
> submodule to gerrit.libreoffice.org:29418 it automatically creates a
> commit in the core repo on your behalf that updates the submodule SHA
> pointer.

Hm, I'm pretty sure I'd seen this behavior (gerrit automatically
creating a core repo commit on your behalf if you push a submodule
commit) last week.  But when I did a change to helpcontent2 now and
pushed it, no automatic commit in master followed, and I had to do that
manually myself.  Did anybody change gerrit's behavior meanwhile, or am
I starting to become confused?

Stephan

_______________________________________________
LibreOffice mailing list
[hidden email]
http://lists.freedesktop.org/mailman/listinfo/libreoffice