Re: [Exist-development] develop branch

[Adam R. <ad...@ex...>]

Sorry I do think there is an issue, but I can help fix it. This was
not a criticism of you, I appreciate that problems happen, but well I
can help fix them.

I didn't know that you were having a hard time removing Diff.java,
literally no one told me or asked me to help you.

On 28 June 2015 at 15:37, Lars Windauer <la...@ex...> wrote:
> Go on if you are sure what you are doing. The .gitignore commit should not have been in there (it was only about removing and adding the scripts path to .gitignore), that happened by accident, but I don’t see the problem.  Like I said several time, this was to remove the Diff.java from the history (as requested by you). If there are real errors, please go on and fix it, I could not find any and no one else reported me any real issue until now. Please make sure, you don’t introduce the Diff.java file again as mentioned at https://help.github.com/articles/remove-sensitive-data/ point 8.
>
> I’m a little bit fed up, cause I said several time, that I’m not feeling well about me removing the file from the Git history, but all feedback I got was “we have to get out the RC1” and "don’t forget my PR”, but no help with all the open issues for or on how to safely delete the Diff.java file (except from Tobi).
>
> __
> Lars Windauer
> eXist Solutions GmbH
>
> phone: + 49 30 83 22 5550
> mobile: +49 170 587 1300
> skype: windauer
>
> Director: Wolfgang Meier
> DE273180763
> AG Darmstadt HRB 89454
>
>> Am 27.06.2015 um 23:38 schrieb Adam Retter <ad...@ex...>:
>>
>> Lars,
>>
>> I think there are still problems as I wrote in my email to this thread.
>>
>> Your commit here
>> https://github.com/eXist-db/exist/commit/cd9c36cd0ad4acb6c7b20280f52e8589ae29ab94
>> seems to touch 98 files. I think you probably only meant to change the
>> .gitignore file? The rest looks like some sort of mistake. Also then
>> the PR from Tobi after your changes seems to want to touch every file
>> in the project - https://github.com/eXist-db/exist/pull/702 Without
>> seeing your local repos it is hard for me to see exactly where the
>> problem lies, but from my perspective right now, it looks like
>> something is quite broken.
>>
>> I can fix this as I have a good copy locally i.e. before these
>> changes, and I can be careful to pick in the updates. Let me know that
>> it is okay for me to do this... I would really like get this fixed
>> ASAP...
>>
>> On 27 June 2015 at 21:27, Lars Windauer <la...@ex...> wrote:
>>> He everyone,
>>>
>>> sorry about the confusion, I should have send a mail before the push
>>> yesterday. It was done to remove the Diff.java file from the history. See
>>> https://help.github.com/articles/remove-sensitive-data/ and
>>> https://rtyley.github.io/bfg-repo-cleaner/ (which is proposed in the first
>>> article).
>>>
>>> Everyone, please be aware of point 8 of the Github hotwo: "Tell your
>>> collaborators to rebase, not merge, any branches they created off of your
>>> old (tainted) repository history. One merge commit could reintroduce some or
>>> all of the tainted history that you just went to the trouble of purging."
>>>
>>> If you find any real bugs cause of push, me might have to roll it back. But
>>> as far as I have tested it (on a fresh checkout) it worked perfectly fine.
>>>
>>> Best regards and sorry again for the confusion
>>>
>>> lars
>>>
>>>
>>>
>>> Am 27.06.2015 um 22:05 schrieb Dmitriy Shabanov <sha...@gm...>:
>>>
>>> Also, travis do not run any test.
>>>
>>> The command "./build.sh travis" exited with 2.
>>>
>>>
>>> On Sat, Jun 27, 2015 at 7:36 PM, Wolfgang Meier <wol...@ex...>
>>> wrote:
>>>>
>>>> Well, my Internet connection doesn't work this weekend, so I couldn't see
>>>> the changes Lars did yesterday evening to clean up the repo in preparation
>>>> of the next release.
>>>>
>>>> But as I understood it, we all need to rebase our local copies. This is
>>>> described on our github page and usually the procedure is painless if you
>>>> follow it exactly.
>>>>
>>>> Wolfgang
>>>>
>>>> Am 27.06.2015 17:36 schrieb "Jens Østergaard Petersen"
>>>> <oe...@gm...>:
>>>>>
>>>>> Is this a git/GitHub problem? Does anyone have any ideas?
>>>>>
>>>>> Jens
>>>>>
>>>>> On 27 Jun 2015 at 10:22:07, Dmitriy Shabanov (sha...@gm...) wrote:
>>>>>
>>>>> Hi,
>>>>>
>>>>> Something bad happen with develop branch?
>>>>>
>>>>> --
>>>>> Dmitriy Shabanov
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> Monitor 25 network devices or servers for free with OpManager!
>>>>> OpManager is web-based network management software that monitors
>>>>> network devices and physical & virtual servers, alerts via email & sms
>>>>> for fault. Monitor 25 devices for free with no restriction. Download now
>>>>>
>>>>> http://ad.doubleclick.net/ddm/clk/292181274;119417398;o_______________________________________________
>>>>> Exist-development mailing list
>>>>> Exi...@li...
>>>>> https://lists.sourceforge.net/lists/listinfo/exist-development
>>>>>
>>>>>
>>>>>
>>>>> ------------------------------------------------------------------------------
>>>>> Monitor 25 network devices or servers for free with OpManager!
>>>>> OpManager is web-based network management software that monitors
>>>>> network devices and physical & virtual servers, alerts via email & sms
>>>>> for fault. Monitor 25 devices for free with no restriction. Download now
>>>>> http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
>>>>> _______________________________________________
>>>>> Exist-development mailing list
>>>>> Exi...@li...
>>>>> https://lists.sourceforge.net/lists/listinfo/exist-development
>>>>>
>>>
>>>
>>>
>>> --
>>> Dmitriy Shabanov
>>> ------------------------------------------------------------------------------
>>> Monitor 25 network devices or servers for free with OpManager!
>>> OpManager is web-based network management software that monitors
>>> network devices and physical & virtual servers, alerts via email & sms
>>> for fault. Monitor 25 devices for free with no restriction. Download now
>>> http://ad.doubleclick.net/ddm/clk/292181274;119417398;o_______________________________________________
>>> Exist-development mailing list
>>> Exi...@li...
>>> https://lists.sourceforge.net/lists/listinfo/exist-development
>>>
>>>
>>>
>>> ------------------------------------------------------------------------------
>>> Monitor 25 network devices or servers for free with OpManager!
>>> OpManager is web-based network management software that monitors
>>> network devices and physical & virtual servers, alerts via email & sms
>>> for fault. Monitor 25 devices for free with no restriction. Download now
>>> http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
>>> _______________________________________________
>>> Exist-development mailing list
>>> Exi...@li...
>>> https://lists.sourceforge.net/lists/listinfo/exist-development
>>>
>>
>>
>>
>> --
>> Adam Retter
>>
>> eXist Developer
>> { United Kingdom }
>> ad...@ex...
>> irc://irc.freenode.net/existdb
>
>
> ------------------------------------------------------------------------------
> Monitor 25 network devices or servers for free with OpManager!
> OpManager is web-based network management software that monitors
> network devices and physical & virtual servers, alerts via email & sms
> for fault. Monitor 25 devices for free with no restriction. Download now
> http://ad.doubleclick.net/ddm/clk/292181274;119417398;o
> _______________________________________________
> Exist-development mailing list
> Exi...@li...
> https://lists.sourceforge.net/lists/listinfo/exist-development
>



-- 
Adam Retter

eXist Developer
{ United Kingdom }
ad...@ex...
irc://irc.freenode.net/existdb