| *** ballock_ is now known as ballock | 10:58 | |
| mal | birdzhang_pc: hi, are you maintainer of nemo:devel:hw:xiaomi:gemini and nemo:devel:hw:xiaomi:vince ? | 12:19 |
|---|---|---|
| *** doniks_ is now known as doniks | 12:20 | |
| birdzhang_pc | mal: i am maintainer of nemo:devel:hw:xiaomi:vince , nemo:devel:hw:xiaomi:gemini's is zhxt | 12:33 |
| mal | birdzhang_pc: ok, anyway you had permissions to both, are those release specific targets in those repos on purpose? | 12:33 |
| mal | birdzhang_pc: usually devel shouldn't have release specific, those should be in testing project | 12:34 |
| birdzhang_pc | yeah it should on testing, but not create it | 12:36 |
| birdzhang_pc | so i should delete it ? | 12:37 |
| mal | I think you should only have the latest target in devel, unless for a good reason (like early access release or something) | 12:38 |
| birdzhang_pc | ok | 12:38 |
| mal | so sailfish_latest_armv7hl is the only one that usually should be there | 12:38 |
| mal | birdzhang_pc: I suggest you get testing projects for those and do releases from there | 12:39 |
| birdzhang_pc | yeah i will | 12:40 |
| mal | the reason why I asked was that I was looking again if I can delete the old targets from devel:common project and saw that many projects still depend on those | 12:41 |
| birdzhang_pc | sorry for that | 12:43 |
| birdzhang_pc | sledges: can you please create nemo:testing:hw:xiaomi:vince project ? | 13:28 |
| demonaxsh | Hi everyone | 14:41 |
| demonaxsh | I have problem in debugging. I'm running gdbserver and attaching to target process, but when i connected to gdbserver via gdb, and send command for example "b droidmediacodec.cpp:796": Cannot access memory at address 0x9810 | 14:41 |
| demonaxsh | Need something else to debug normally? When I load symbols for debugging, then there are no problems: Reading symbols from /home/n0men/alps/out/target/product/c71a/symbols/system/lib/libdroidmedia.so...done | 14:41 |
| ohyash_ | just created a PR for tomato in fixup-mountpoints | 18:08 |
| ohyash_ | ugh... for fixup-mountpoints in hybris-boot | 18:09 |
| ohyash_ | Not very used to patching. Hence deleted and reuploaded fixup-mountpoints like an idiot | 18:11 |
| mal | ohyash_: wow, that's an exceptionally bad way to do it | 18:11 |
| ohyash_ | imma redo it then. | 18:11 |
| mal | ohyash_: just squash the commits into one | 18:12 |
| mal | ohyash_: and then force push to the same branch | 18:12 |
| r0kk3rz | yeah its not like editing and commiting the file is that hard :P | 18:16 |
| ohyash_ | Done this for now. I was lost with "HEAD detached from <some point>" while squashing. Re-cloned and updated for now. I need more git practice. | 18:32 |
| mal | ohyash_: so you didn't listen to me when I said to force push to the same branch | 18:34 |
| mal | ohyash_: you NEVER have to make a new PR, everything can be done in the original PR | 18:34 |
| ohyash_ | I tried checkout master. Oh you meant checkout --force? | 18:36 |
| mal | ohyash_: I said push | 18:36 |
| mal | ohyash_: you probably will have to learn it still because the commit message doesn't follow the usual commit format | 18:37 |
| ohyash_ | it wouldn't even commit. "nothing to commit". and push didnt work either :/ | 18:38 |
| mal | you do know that web is full of git instructions | 18:38 |
| mal | if you edit only the last commit then you need git amend, if you edit git history in any way locally then you need to force push it | 18:39 |
| ohyash_ | yes it's full. but instructions on stackoverflow worked for their OP and I thought I'd screwed it up and cant be repaired. | 18:42 |
| mal | it's not really rocket science or anything like that | 18:43 |
| ohyash_ | Oh, amend is what I was looking for but didn't search it right I guess. | 18:44 |
| mal | interactive rebase is very useful for many things also | 18:44 |
| ohyash_ | mal: definitely not. Just never had used git from cli much. (other than committing and pushing to my repo) | 18:44 |
| ohyash_ | I did interactive rebase to squash the commits | 18:45 |
| ohyash_ | and it worked | 18:45 |
| ohyash_ | then I realized there's no remote link. | 18:45 |
| ohyash_ | I added it then | 18:45 |
| ohyash_ | and did git pull. Thats where it lost to "HEAD detached from <point>" | 18:46 |
| ohyash_ | and I couldn't push | 18:46 |
| ohyash_ | or "git checkout master" | 18:46 |
| ohyash_ | stupidity beyond limits? | 18:47 |
| mal | why would you do git pull in that stage | 18:49 |
| mal | git fetch is useful also | 18:50 |
| ohyash_ | because I added remote at a later point and it wouldn't push. Told me to pull | 18:50 |
| mal | how is it possible that you didn't have a remote? | 18:51 |
| ohyash_ | yeah its weird. it was fetched using repo and had git log of mer-hybris. but when I tried to push with my commi9t, it asked me to set remote | 18:53 |
| ohyash_ | guess git fetch wouldn't have created the HEAD deviating problem for me | 18:54 |
| mal | so git remote -v didn't list anything? | 18:54 |
| ohyash_ | did not know about that. Now I have deleted that copy and fresh pulled from my fork :/ | 18:58 |
| mal | ohyash_: another hint, git reset --hard | 19:02 |
| ohyash_ | I'm getting this merge commit when after I try to do --amend and it wants me to redo git pull. | 19:14 |
| mal | how can it be that difficult | 19:20 |
| ohyash_ | Never mind. Now I realise where force push was needed | 19:21 |
| ohyash_ | seems to be updated | 19:21 |
| ohyash_ | in PR as well | 19:21 |
| mal | maybe you now learned something useful | 19:22 |
| ohyash_ | Yes, plenty of things together. | 19:23 |
| ohyash_ | Thanks even though this is not really your job to teach git | 19:23 |
| ohyash_ | blogs misdirect at times. I went through a blog that had tricks to skip merge commit. and it suggested stupid shit where push --force was needed | 19:25 |
Generated by irclog2html.py 2.17.1 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!