| bgstack15 | Aw man, I bet LeePen's gone for the night already. That d1src-merge while in my suites/unstable branch somehow didn't do what I wanted it to do and I'm really mad. I'm so glad I had the foresight to make a duplicate branch with my useful changes. | 03:18 |
|---|---|---|
| LeePen | bgstack15: Sorry for that. What happened? | 04:33 |
| LeePen | 04:33 | |
| bgstack15 | When I ran d1src-merge, it did not appear to place my one commit from my suites/unstable branch on top of [whatever happened to debian/4.10.2something] | 05:26 |
| bgstack15 | the way I was expecting. For some reason it somehow kept a good portion of debian/ from exactly my suites/unstable from version 4.9.11 including some now-unncessary-debian-patches which were part of Timo's package (Debian) and not my commits at all and so shouldn't have still been there. | 05:27 |
| rrq | one "safe" way to merge could be: git merge --no-commit --no-ff -s ours master | 05:36 |
| rrq | the "-s ours" stops any code to be taken from the source branch, but makes the history look like a merge when you, after some fixes, next commit | 05:37 |
| rrq | so, after that "pretend merge", you update your branch to how you want it,.. then add to the set of files to commit, and then commit | 05:38 |
| bgstack15 | rrq: and this operation should be run from branch "ours", so suite/unstable ? | 05:39 |
| bgstack15 | or is "ours" a literal | 05:39 |
| rrq | doing so will be good for future updates on the master branch; i.e., nothing priori to this merge point will seep in | 05:39 |
| rrq | yes... (hmm I need to confirm in the manpage) | 05:39 |
| rrq | right; the "ours" strategy | 05:40 |
| rrq | it kind of "tells git" that "here my branch is synchronized wiht master" | 05:41 |
| bgstack15 | so we basically do a rebase, without telling git that we're doing a rebase? | 05:42 |
| rrq | yes I guess, though without using the other branch's code | 05:43 |
| rrq | and with some advantage(?) of showing where your branch actually started | 05:47 |
| rrq | .. of also showing .. | 05:47 |
| rrq | I think "cherry picking" might also be useful here... to pick particular commits from that other branch. but I have never actually used it myself | 05:51 |
| LeePen | bgstack15: When you merge you won't end up with your commit on top, but it should still be present. | 08:19 |
| LeePen | I will try it with your tree later. This was freeipa? | 08:20 |
| bgstack15 | LeePen: yes, freeipa. | 13:37 |
| bgstack15 | And just in case you're not familiar with this, I noticed that Debian has now enabled building the server-side packages of freeipa (for the first time in my awareness which spans a few years). I have no idea if this will compile/operate correctly on Devuan so just beware. | 13:38 |
| bgstack15 | whew, no wonder I just always rebase... Sorry mate, this merge business doesn't do what I want and required way more effort to just update the few changes I make. | 14:07 |
| ManinTheSandbox1 | i/ | 16:14 |
| ManinTheSandbox1 | i want to start mantaining packages | 16:14 |
| ManinTheSandbox1 | with what type of example can I start? | 16:14 |
| golinux | LeePen: A conversation on the forum about non-free-firmware prompted me to poke around the Release Notes. | 16:29 |
| golinux | The only place in the document where Non-free-firmware with 2 hyphens is mentioned is in the top Index. | 16:31 |
| golinux | In the ## Non-free firmware section there is no mention that there is a NEW package for non-free-firmware. Perhaps there is some clarification needed there about it being a new package? | 16:33 |
| alv | aloaa | 17:58 |
| alv | hi all | 17:59 |
| ManinTheSandbox | Mornin! | 18:07 |
| alv | is there a devuan meeting this night ?? if yes a what time and where ? | 19:47 |
| golinux | Hi alv. Long time no see | 20:06 |
| golinux | Yes. | 20:07 |
| alv | cool i want to partecipate this evening if possible @golinux | 20:31 |
| alv | because i saw the devuan 5 came out so after the 21 of August ill give a try on it just to do some testing as usual | 20:33 |
| golinux | Really good to see you. We need to catch up! | 20:36 |
| sachy | im going to install excalibur in a few days on my daily sys, any special notes/warnings? | 20:46 |
| golinux | Yeah . . . it's testing and very new. | 20:48 |
| sachy | has been running both beowulf and chimarea from early testing stages, so going to repeat with E again | 20:48 |
| alv | cool i started testing devuan from lenny | 21:14 |
| alv | so @golinux is there a meeting today ??? | 21:15 |
| brocashelm | alv: to quote bgstack15: "Devuan meet tomorrow, Thursday, at 20:30 UTC. Pad is here: https://pad.dyne.org/code/#/2/code/edit/reSubsmCiMboZ5uK0jcLvNIv/" | 21:23 |
| brocashelm | so i think in an hour? | 21:24 |
| golinux | About that | 21:24 |
| alv | ok then is 22:30 CEST time ? | 21:28 |
| alv | cool il be there thanks | 21:30 |
| brocashelm | cool :) | 21:58 |
Generated by irclog2html.py 2.17.0 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!