Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial git version #9

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Initial git version #9

wants to merge 3 commits into from

Conversation

Kaacz
Copy link

@Kaacz Kaacz commented Jul 23, 2014

Ok, I make 3 commits one by one patches. But automatically merged to one pull request .. :)

@van-ess0
Copy link
Contributor

Your patches wont work because of wrong paths in the *.patch files. Have you tested them?

@CODeRUS
Copy link

CODeRUS commented Jul 23, 2014

paths are ok for me. @van-ess0 you need to be at / and apply with -p1, or just deploy to patchmanager :)

@van-ess0
Copy link
Contributor

@CODeRUS , hm, I was confused by original/usr/lib/qt5/qml/Sailfish/Silica/private/MenuIndicator.qml, patched/usr/lib/qt5/qml/Sailfish/Silica/private/MenuIndicator.qml and so one.

But if you say so, i should apologize to @Kaacz and learn more :)

@Kaacz
Copy link
Author

Kaacz commented Jul 23, 2014

Yes, all is tested directly with patchmanager. No need try patch command. :)

@Kaacz
Copy link
Author

Kaacz commented Jul 23, 2014

@SfietKonstantin looks at patches, only ask me for split to extra commit for each patch. :)

@Kaacz
Copy link
Author

Kaacz commented Jul 23, 2014

IMHO best way is test it with patchmanager. :)

@Kaacz
Copy link
Author

Kaacz commented Jul 23, 2014

@van-ess0 Yes, when I started to make patches, I was surprised with paths, but it's work's! :)

@SfietKonstantin
Copy link
Contributor

@Kaacz I was asking you to squash commits :( ;) (to put all commits into one)

@SfietKonstantin
Copy link
Contributor

@Kaacz git rebase -i HEAD^^^, do some changes (like putting f or s in front of some commits), and pit push origin master -f

No need to push a new pull request it will be updated automatically.

@Kaacz
Copy link
Author

Kaacz commented Jul 24, 2014

@SfietKonstantin LOL .. translator say me squash => something in mean split to smaller pieces .. LOL .. Not exist direct translate squash to czech language .. i know it only as game name .. :)

I am not understand your first comment under previous pull request. I have 3 patches and each patch have only one patch/diff file .. maybe we not understand together.
There are 3 different patches .. no way to have only one patchfile. This must be selectable as 3 patches in patchmanager UI. Will be good to make this clean between as. :)

PS: about more commits in one pull request: when i have opened pull request and next day create new commit for changes in other files, automatically is added to opened pull request.. This surprised me ..

@Kaacz
Copy link
Author

Kaacz commented Aug 21, 2014

Sorry, I am lost interest to hack smartphone GUI on Jolla. Tired me all about it. When I not sell phone, I will leave it as basic compute toy without need GUI and GSM connectivity -as overpriced cubieboard :). Feel free use my git with hacks.. :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants