Re: Migrate SVN -> Git

2019-06-18 Thread Vladimir Sitnikov
> Does it reproduce for the local repo only? >yes The solution is: 1) commit the changes (ensure `git status` "no modifications". untracked files are fine) 2) remove the offending files (e.g. rm bin/report-template/sbadmin2-1.0.7/bower_components/flot.tooltip/js) 3) git reset --hard (it will re-cr

Re: [VOTE] JMeter: migration to Git+Gradle

2019-06-18 Thread Vladimir Sitnikov
Any updates here? I see new commits are landing the repo, however the feedback re Gradle is very limited. Apparently it is fully positive. Well. When new commits change existing files it is trivial for me. However it does bother me when new files are created (e.g. new files in https://github.com/

Re: Migrate SVN -> Git

2019-06-18 Thread Philippe Mouawad
On Tue, Jun 18, 2019 at 10:47 PM Vladimir Sitnikov < sitnikov.vladi...@gmail.com> wrote: > Does it reproduce when you clone the fork again? > No > Does it reproduce for the local repo only? > yes > > In other words, does it happen when you do git clone > https://github.com/ubikloadpack/jmeter.gi

Re: Migrate SVN -> Git

2019-06-18 Thread Vladimir Sitnikov
Does it reproduce when you clone the fork again? Does it reproduce for the local repo only? In other words, does it happen when you do git clone https://github.com/ubikloadpack/jmeter.git (or whatever repo you use) ? Vladimir

Re: Migrate SVN -> Git

2019-06-18 Thread Philippe Mouawad
On a forked repository, I checkout a branch and run git status I have all those files marked as to be commited due to CRLF/LF difference On Tue, Jun 18, 2019 at 10:39 PM Vladimir Sitnikov < sitnikov.vladi...@gmail.com> wrote: > >modified: > > >bin/report-template/sbadmin2-1.0.7/bower_components/f

Re: Migrate SVN -> Git

2019-06-18 Thread Vladimir Sitnikov
>modified: >bin/report-template/sbadmin2-1.0.7/bower_components/flot.tooltip/js/jquery.flot.js What's the step by step? Vladimir

Re: Migrate SVN -> Git

2019-06-18 Thread Philippe Mouawad
Hello, I am having same issue as Felix with Line endings. I am on Mac OSX , I applied: - git config --global core.autocrlf input but issue persists. But I always have those: Changes not staged for commit: (use "git add ..." to update what will be committed) (use "git checkout -- ..." to

Re: Buildbot and Git

2019-06-18 Thread sebb
On Tue, 18 Jun 2019 at 07:42, Felix Schumacher wrote: > > > Am 17.06.19 um 21:57 schrieb sebb: > > On Mon, 17 Jun 2019 at 17:44, Felix Schumacher > > wrote: > >> > >> Am 16.06.19 um 21:02 schrieb Felix Schumacher: > >>> Hi all, > >>> > >>> I tried to adapt the buildbot config for JMeter to reflec