You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by Gilles <gi...@harfang.homelinux.org> on 2016/10/21 11:10:46 UTC

Re: [01/51] [partial] commons-rng git commit: Multimodule support

Hi.

On Thu, 20 Oct 2016 23:29:08 -0000, bartem@apache.org wrote:
> Repository: commons-rng
> Updated Branches:
>   refs/heads/multimodule [created] d1b3113ae
>
>
> 
> http://git-wip-us.apache.org/repos/asf/commons-rng/blob/d1b3113a/commons-rng-core/site-content/.svn/pristine/61/610202008fbfaca197f91798f2c9be651dd041b2.svn-base
> 
> ----------------------------------------------------------------------
> diff --git
> 
> a/commons-rng-core/site-content/.svn/pristine/61/610202008fbfaca197f91798f2c9be651dd041b2.svn-base
> 
> b/commons-rng-core/site-content/.svn/pristine/61/610202008fbfaca197f91798f2c9be651dd041b2.svn-base
> new file mode 100644
> index 0000000..0ba6567
> Binary files /dev/null and
> 
> b/commons-rng-core/site-content/.svn/pristine/61/610202008fbfaca197f91798f2c9be651dd041b2.svn-base
> differ

Shouldn't the "site-content" directory have been "ignore"d (by git)?

Regards,
Gilles


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Re: [01/51] [partial] commons-rng git commit: Multimodule support

Posted by Artem Barger <ar...@bargr.net>.
On Sat, Oct 22, 2016 at 5:24 PM, Gilles <gi...@harfang.homelinux.org>
wrote:

> I don't think that's what caused all those files to be tracked:
>

Removing​ "/" from "/site-content" will make git to ignore this folder
within modules folders as well.



> ---CUT---
> $ git check-ignore site-content
> site-content
> ---CUT---
> [Meaning that "/site-content" in ".gitignore" effectively ignores
> that directory.]
>
> $ git ls-tree -r master --name-only
> ... output skipped ...
> [Shows that the files were not tracked on "master".]
>
> I think that it would be better to delete that branch and create
> a clean one (to avoid having those spurious files in the history).
>

​Done.​


Best regards,
                      Artem Barger.

Re: [01/51] [partial] commons-rng git commit: Multimodule support

Posted by Gilles <gi...@harfang.homelinux.org>.
On Fri, 21 Oct 2016 23:47:41 +0300, Artem Barger wrote:
> \u200bHi,\u200b
>
> On Fri, Oct 21, 2016 at 2:10 PM, Gilles 
> <gi...@harfang.homelinux.org>
> wrote:
>
>> Hi.
>>
>> On Thu, 20 Oct 2016 23:29:08 -0000, bartem@apache.org wrote:
>>
>>> Repository: commons-rng
>>> Updated Branches:
>>>   refs/heads/multimodule [created] d1b3113ae
>>>
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/commons-rng/blob/d1b3
>>> 113a/commons-rng-core/site-content/.svn/pristine/61/61020
>>> 2008fbfaca197f91798f2c9be651dd041b2.svn-base
>>>
>>> 
>>> ----------------------------------------------------------------------
>>> diff --git
>>>
>>> a/commons-rng-core/site-content/.svn/pristine/61/610202008fb
>>> faca197f91798f2c9be651dd041b2.svn-base
>>>
>>> b/commons-rng-core/site-content/.svn/pristine/61/610202008fb
>>> faca197f91798f2c9be651dd041b2.svn-base
>>> new file mode 100644
>>> index 0000000..0ba6567
>>> Binary files /dev/null and
>>>
>>> b/commons-rng-core/site-content/.svn/pristine/61/610202008fb
>>> faca197f91798f2c9be651dd041b2.svn-base
>>> differ
>>>
>>
>> Shouldn't the "site-content" directory have been "ignore"d (by git)?
>>
>
> \u200bYes it should, but I think "back slash" in .gitignore prevents that.

I don't think that's what caused all those files to be tracked:
---CUT---
$ git check-ignore site-content
site-content
---CUT---
[Meaning that "/site-content" in ".gitignore" effectively ignores
that directory.]

$ git ls-tree -r master --name-only
... output skipped ...
[Shows that the files were not tracked on "master".]

I think that it would be better to delete that branch and create
a clean one (to avoid having those spurious files in the history).


Thanks,
Gilles


>
> Best regards,
>                       Artem Barger.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Re: [01/51] [partial] commons-rng git commit: Multimodule support

Posted by Artem Barger <ar...@bargr.net>.
​Hi,​

On Fri, Oct 21, 2016 at 2:10 PM, Gilles <gi...@harfang.homelinux.org>
wrote:

> Hi.
>
> On Thu, 20 Oct 2016 23:29:08 -0000, bartem@apache.org wrote:
>
>> Repository: commons-rng
>> Updated Branches:
>>   refs/heads/multimodule [created] d1b3113ae
>>
>>
>>
>> http://git-wip-us.apache.org/repos/asf/commons-rng/blob/d1b3
>> 113a/commons-rng-core/site-content/.svn/pristine/61/61020
>> 2008fbfaca197f91798f2c9be651dd041b2.svn-base
>>
>> ----------------------------------------------------------------------
>> diff --git
>>
>> a/commons-rng-core/site-content/.svn/pristine/61/610202008fb
>> faca197f91798f2c9be651dd041b2.svn-base
>>
>> b/commons-rng-core/site-content/.svn/pristine/61/610202008fb
>> faca197f91798f2c9be651dd041b2.svn-base
>> new file mode 100644
>> index 0000000..0ba6567
>> Binary files /dev/null and
>>
>> b/commons-rng-core/site-content/.svn/pristine/61/610202008fb
>> faca197f91798f2c9be651dd041b2.svn-base
>> differ
>>
>
> Shouldn't the "site-content" directory have been "ignore"d (by git)?
>

​Yes it should, but I think "back slash" in .gitignore prevents that. ​


Best regards,
                      Artem Barger.