| *** tpb has joined #symbiflow | 00:00 | |
| *** somlo has quit IRC | 02:53 | |
| *** somlo has joined #symbiflow | 03:03 | |
| *** citypw has joined #symbiflow | 04:06 | |
| *** proteusguy has quit IRC | 04:36 | |
| *** _whitelogger has quit IRC | 05:12 | |
| *** _whitelogger has joined #symbiflow | 05:15 | |
| *** proteus-guy has joined #symbiflow | 06:21 | |
| *** proteus-guy is now known as proteusguy | 06:22 | |
| nats` | mithro, no problem it's cool the project is fun and people are really great !I learn a lot so my pleasure :) | 09:02 |
|---|---|---|
| *** citypw has quit IRC | 09:55 | |
| *** kraiskil has joined #symbiflow | 13:44 | |
| *** celadon has quit IRC | 13:55 | |
| *** celadon has joined #symbiflow | 13:59 | |
| *** kraiskil has quit IRC | 15:13 | |
| *** xobs has quit IRC | 15:39 | |
| *** galv[m] has quit IRC | 15:40 | |
| *** mrhat2010[m] has quit IRC | 15:40 | |
| *** mrhat2010[m] has joined #symbiflow | 15:41 | |
| *** xobs has joined #symbiflow | 15:41 | |
| *** kraiskil has joined #symbiflow | 15:47 | |
| *** galv[m] has joined #symbiflow | 15:49 | |
| *** proteusguy has quit IRC | 16:09 | |
| *** kraiskil has quit IRC | 16:24 | |
| *** kraiskil has joined #symbiflow | 16:58 | |
| *** Ultrasauce has quit IRC | 17:37 | |
| *** Ultrasauce has joined #symbiflow | 17:38 | |
| *** Ultrasauce has quit IRC | 18:15 | |
| *** Ultrasauce has joined #symbiflow | 18:15 | |
| nats` | plop | 18:48 |
| *** kraiskil has quit IRC | 21:02 | |
| nats` | litghost, I patched the run_fuzzer python I'll push | 21:19 |
| litghost | Sounds good | 21:19 |
| nats` | still I'm wondering for the order of thread | 21:24 |
| nats` | I used map but it's still not in order | 21:24 |
| nats` | is it normal ? | 21:24 |
| nats` | ohh last question | 21:25 |
| nats` | by default do you want vivado to output all message or should I hid them to not clutter the terminal ? | 21:26 |
| litghost | Let's get the PR pulled and do further refinements then | 21:26 |
| litghost | the current PR has lots of value as is | 21:26 |
| nats` | oky I push | 21:28 |
| nats` | should I squash before ? | 21:28 |
| nats` | or do you want to review before ? | 21:28 |
| litghost | squash now, if you have your changes in | 21:29 |
| nats` | oky :) | 21:30 |
| nats` | uhh litghost how to rebase squash when in the middle I merged the upstream to be up to date ? | 21:37 |
| nats` | is it even possible ? | 21:37 |
| nats` | pick 517ad6c fuzzers: 074: fix path to generate_after_dump | 21:37 |
| nats` | pick 47f8f6e fuzzers: int_loop: create empty DB also in seeded target | 21:37 |
| nats` | pick e1b9ab5 Increase N for NFFMUX and NOUTMUX to prevent false matches. | 21:37 |
| nats` | pick 89bf011 Accumulate all missing features, rather than stopping on first failure. | 21:37 |
| nats` | pick e525def fuzzers: Copy all the db files to build/database | 21:37 |
| nats` | pick 051693b Increase N to prevent including INT bits. | 21:37 |
| nats` | pick d9026ba fuzzers: 001: fix yaml/json file names | 21:37 |
| nats` | pick 4ba4c6b Add retries to bidirection PIP fuzzer. | 21:37 |
| nats` | pick dc06006 Fix copy/paste error, no such var as myff. | 21:37 |
| nats` | pick 63b3971 Move 1-time part of loop out of loop. | 21:37 |
| nats` | pick f057847 PR #526 Integration thread parameters in Makefile before squash | 21:37 |
| nats` | pick 7742a8e PR cosmetic fix | 21:37 |
| nats` | ahhh | 21:37 |
| nats` | sorry wrong copy pasta | 21:37 |
| nats` | https://pastebin.com/dJm3V4aF | 21:38 |
| tpb | Title: [VIM] squash - Pastebin.com (at pastebin.com) | 21:38 |
| litghost | Sorry, rephrase? | 21:39 |
| nats` | I have my commit but in the middle I have commit from upstream | 21:41 |
| nats` | if I rebase/squash I'll squash also ccommit from other people no ?. | 21:41 |
| nats` | wow ! | 21:46 |
| nats` | I can simply change order in the commit list when rebasing ! | 21:47 |
| nats` | is it true oO | 21:47 |
| litghost | nats: Yes, you can change the order | 21:47 |
| litghost | In order to avoid pulling in other commits, rebase on master first | 21:48 |
| nats` | I'm not sure what that means | 21:49 |
| litghost | Run "git rebase master" | 21:50 |
| litghost | Cleanup any merge conflicts, etc | 21:50 |
| litghost | the run "git rebase -i master" | 21:50 |
| litghost | and squash as needed | 21:50 |
| nats` | uhhhhmmmmm I may have broken something :] I'll reclone a fresh one and apply patch | 21:54 |
| litghost | you can always run "git rebase --abort" if you get lost | 21:55 |
| nats` | uhhhmmmm it's more complicated and I think you'll laugh | 21:56 |
| nats` | I forgot to enter -i | 21:56 |
| nats` | so it did sort of a fast forward rebase | 21:56 |
| litghost | lol, ya | 21:56 |
| nats` | but not really what I planned | 21:56 |
| nats` | I see it in reflog but it's messy | 21:56 |
| nats` | I'll try to make a fresh one | 21:57 |
| nats` | to be honnest git is scary for me | 21:57 |
| litghost | There are resources for getting a better understanding. Git isn't too scary, and once you understand how to use reset/branches to protect yourself, you can basically never lose work | 22:05 |
| nats` | sure now that i participate in a big project with people I'll certainly spend sometime on that topic | 22:06 |
| nats` | I was pretty happy with my svnish use of it when alone | 22:07 |
| nats` | litghost, I think I got myself out of problem but I would like to be careful how should I process, if I push force on my git it can't break anything on master repo ? | 22:18 |
| nats` | proceed | 22:18 |
| litghost | you lack write access to the master repo | 22:22 |
| litghost | In general when force push-ing, specific both the target remote and target branch | 22:22 |
| litghost | e.g. "git push <target remote> <target branch> --force | 22:22 |
| nats` | sure, let's hope github will not play smart and display garbage everywhere like in previous PR :D | 22:23 |
| nats` | litghost, https://github.com/natsfr/prjxray/commits/master can you look at that I don't like there are few commit with you me and me in author field... | 22:30 |
| tpb | Title: Commits · natsfr/prjxray · GitHub (at github.com) | 22:30 |
| litghost | You should be able to squash that? | 22:31 |
| nats` | but those are your commit not mine | 22:32 |
| nats` | why does it appears on my name ? | 22:32 |
| litghost | Not sure | 22:34 |
| litghost | Ah, have you been copying my signoff message by any change? | 22:34 |
| litghost | chance? | 22:34 |
| nats` | nop maybe changing commit order break something ? | 22:34 |
| litghost | "Signed-off-by: Keith Rothman <[email protected]>" | 22:34 |
| litghost | Not sure then | 22:34 |
| nats` | uhhmm ok so next step I clone from the main repo apply patch then squash | 22:35 |
| nats` | so it'll not have all this mess I created by fetching merge in the middle | 22:35 |
| nats` | oky litghost I think I fixed things | 22:47 |
| nats` | you can take a look | 22:47 |
| nats` | thanks for the night long test litghost :) | 22:58 |
| nats` | I'll wait for your test before cleaning the 072 because we may move the worker function in utils.py after that | 23:00 |
| nats` | oky time to go to bed for me | 23:05 |
| nats` | have a good night I'll try to not dream about git hell :) | 23:05 |
| nats` | ++ | 23:05 |
Generated by irclog2html.py 2.13.1 by Marius Gedminas - find it at mg.pov.lt!