Contribute a Fix and Reviewing changes
Hi, I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video. But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files And I still have problems viewing pull requests from within pharo: I thought this would work meanwhil. Thanks in advance nicolai
Hi, did you commit on Windows? Because Iceberg seems to commit in platform-specific line endings, so I always need to convert it manually... ( https://github.com/PowerShell/Win32-OpenSSH/wiki/Dos2Unix---Text-file-format... ) Notice also that all the files are from the same directory ... when you commit even a single change, the entire package is filed out. Peter On Tue, Apr 10, 2018 at 11:16 PM, Nicolai Hess <nicolaihess@gmail.com> wrote:
Hi,
I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video.
But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files
And I still have problems viewing pull requests from within pharo:
I thought this would work meanwhil.
Thanks in advance
nicolai
Ah! Ok. 2018-04-10 23:26 GMT+02:00 Peter Uhnák <i.uhnak@gmail.com>:
Hi,
did you commit on Windows? Because Iceberg seems to commit in platform-specific line endings, so I always need to convert it manually... ( https://github.com/PowerShell/Win32-OpenSSH/wiki/ Dos2Unix---Text-file-format-converters )
And how can I do this, if my changes are managed by iceberg ? Do I have to manually change the files in my local branch (right at my git directory) and can I then still upload the fix from within iceberg?
Notice also that all the files are from the same directory ... when you commit even a single change, the entire package is filed out.
Peter
On Tue, Apr 10, 2018 at 11:16 PM, Nicolai Hess <nicolaihess@gmail.com> wrote:
Hi,
I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video.
But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files
And I still have problems viewing pull requests from within pharo:
I thought this would work meanwhil.
Thanks in advance
nicolai
yes, thatâs why I asked about the problem with line endings. I will solve it, heh⦠donât worry. In the mean time I will fix the PR tomorrow. Esteban
On 10 Apr 2018, at 23:31, Nicolai Hess <nicolaihess@gmail.com> wrote:
Ah! Ok.
2018-04-10 23:26 GMT+02:00 Peter Uhnák <i.uhnak@gmail.com <mailto:i.uhnak@gmail.com>>: Hi,
did you commit on Windows? Because Iceberg seems to commit in platform-specific line endings, so I always need to convert it manually... ( https://github.com/PowerShell/Win32-OpenSSH/wiki/Dos2Unix---Text-file-format... <https://github.com/PowerShell/Win32-OpenSSH/wiki/Dos2Unix---Text-file-format...> )
And how can I do this, if my changes are managed by iceberg ? Do I have to manually change the files in my local branch (right at my git directory) and can I then still upload the fix from within iceberg?
Notice also that all the files are from the same directory ... when you commit even a single change, the entire package is filed out.
Peter
On Tue, Apr 10, 2018 at 11:16 PM, Nicolai Hess <nicolaihess@gmail.com <mailto:nicolaihess@gmail.com>> wrote: Hi,
I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video.
But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 <https://github.com/pharo-project/pharo/pull/1189> But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files
And I still have problems viewing pull requests from within pharo:
<grafik.png>
I thought this would work meanwhil.
Thanks in advance
nicolai
Hi, I --amend(ed) the commit after I converted it. If you've already pushed, you can force-push (there's no one using your code yet, so forcing shouldn't be an issue). If you have multiple commits, then you'd need to filter all the commits (filter-branch iirc), so the newlines are correct in every single commit. Peter On Tue, Apr 10, 2018 at 11:31 PM, Nicolai Hess <nicolaihess@gmail.com> wrote:
Ah! Ok.
2018-04-10 23:26 GMT+02:00 Peter Uhnák <i.uhnak@gmail.com>:
Hi,
did you commit on Windows? Because Iceberg seems to commit in platform-specific line endings, so I always need to convert it manually... ( https://github.com/PowerShell/Win32-OpenSSH/wiki/Dos2Unix- --Text-file-format-converters )
And how can I do this, if my changes are managed by iceberg ? Do I have to manually change the files in my local branch (right at my git directory) and can I then still upload the fix from within iceberg?
Notice also that all the files are from the same directory ... when you commit even a single change, the entire package is filed out.
Peter
On Tue, Apr 10, 2018 at 11:16 PM, Nicolai Hess <nicolaihess@gmail.com> wrote:
Hi,
I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video.
But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files
And I still have problems viewing pull requests from within pharo:
I thought this would work meanwhil.
Thanks in advance
nicolai
Esteban, maybe (until the issue is properly resolved) Iceberg could have a conditional check that the repo is pharo itself and just forced the output to be LF? Peter On Tue, Apr 10, 2018 at 11:36 PM, Peter Uhnák <i.uhnak@gmail.com> wrote:
Hi,
I --amend(ed) the commit after I converted it. If you've already pushed, you can force-push (there's no one using your code yet, so forcing shouldn't be an issue). If you have multiple commits, then you'd need to filter all the commits (filter-branch iirc), so the newlines are correct in every single commit.
Peter
On Tue, Apr 10, 2018 at 11:31 PM, Nicolai Hess <nicolaihess@gmail.com> wrote:
Ah! Ok.
2018-04-10 23:26 GMT+02:00 Peter Uhnák <i.uhnak@gmail.com>:
Hi,
did you commit on Windows? Because Iceberg seems to commit in platform-specific line endings, so I always need to convert it manually... ( https://github.com/PowerShell/Win32-OpenSSH/wiki/Dos2Unix- --Text-file-format-converters )
And how can I do this, if my changes are managed by iceberg ? Do I have to manually change the files in my local branch (right at my git directory) and can I then still upload the fix from within iceberg?
Notice also that all the files are from the same directory ... when you commit even a single change, the entire package is filed out.
Peter
On Tue, Apr 10, 2018 at 11:16 PM, Nicolai Hess <nicolaihess@gmail.com> wrote:
Hi,
I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video.
But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files
And I still have problems viewing pull requests from within pharo:
I thought this would work meanwhil.
Thanks in advance
nicolai
On 10 Apr 2018, at 23:37, Peter Uhnák <i.uhnak@gmail.com> wrote:
Esteban, maybe (until the issue is properly resolved) Iceberg could have a conditional check that the repo is pharo itself and just forced the output to be LF?
yes, it could. I will add that tomorrow *if* libgit does not follow .gitattributes. Esteban
Peter
On Tue, Apr 10, 2018 at 11:36 PM, Peter Uhnák <i.uhnak@gmail.com <mailto:i.uhnak@gmail.com>> wrote: Hi,
I --amend(ed) the commit after I converted it. If you've already pushed, you can force-push (there's no one using your code yet, so forcing shouldn't be an issue). If you have multiple commits, then you'd need to filter all the commits (filter-branch iirc), so the newlines are correct in every single commit.
Peter
On Tue, Apr 10, 2018 at 11:31 PM, Nicolai Hess <nicolaihess@gmail.com <mailto:nicolaihess@gmail.com>> wrote: Ah! Ok.
2018-04-10 23:26 GMT+02:00 Peter Uhnák <i.uhnak@gmail.com <mailto:i.uhnak@gmail.com>>: Hi,
did you commit on Windows? Because Iceberg seems to commit in platform-specific line endings, so I always need to convert it manually... ( https://github.com/PowerShell/Win32-OpenSSH/wiki/Dos2Unix---Text-file-format... <https://github.com/PowerShell/Win32-OpenSSH/wiki/Dos2Unix---Text-file-format...> )
And how can I do this, if my changes are managed by iceberg ? Do I have to manually change the files in my local branch (right at my git directory) and can I then still upload the fix from within iceberg?
Notice also that all the files are from the same directory ... when you commit even a single change, the entire package is filed out.
Peter
On Tue, Apr 10, 2018 at 11:16 PM, Nicolai Hess <nicolaihess@gmail.com <mailto:nicolaihess@gmail.com>> wrote: Hi,
I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video.
But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 <https://github.com/pharo-project/pharo/pull/1189> But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files
And I still have problems viewing pull requests from within pharo:
<grafik.png>
I thought this would work meanwhil.
Thanks in advance
nicolai
Hi nicolai Keep pushing :) I succeeded to make it work and now I'm eager to use the new UI and refactored version. Stef On Tue, Apr 10, 2018 at 11:16 PM, Nicolai Hess <nicolaihess@gmail.com> wrote:
Hi,
I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video.
But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files
And I still have problems viewing pull requests from within pharo:
I thought this would work meanwhil.
Thanks in advance
nicolai
tomorrow I will present it to the world ;) and in theory it will be released, but today the CI was dead :( Esteban
On 11 Apr 2018, at 21:29, Stephane Ducasse <stepharo.self@gmail.com> wrote:
Hi nicolai
Keep pushing :) I succeeded to make it work and now I'm eager to use the new UI and refactored version.
Stef
On Tue, Apr 10, 2018 at 11:16 PM, Nicolai Hess <nicolaihess@gmail.com <mailto:nicolaihess@gmail.com>> wrote: Hi,
I tried to create a pull request with IceBerg. I followed the CONTRIBUTING HowTo and Markus' create TechTalk-Video.
But I must have done something wrong. This is my pull request: https://github.com/pharo-project/pharo/pull/1189 <https://github.com/pharo-project/pharo/pull/1189> But although I just changes one line in one method. The gitub pull request side shows Commit 1 Files changed 40! But I did not change 40 files
And I still have problems viewing pull requests from within pharo:
<grafik.png>
I thought this would work meanwhil.
Thanks in advance
nicolai
participants (4)
-
Esteban Lorenzano -
Nicolai Hess -
Peter Uhnák -
Stephane Ducasse