#tde-devs < 2023/06/14 >
[01:18]SlavekB has quit (Ping timeout: 255 seconds)
[01:38]SlavekB has joined
[02:15]micheleC has joined
[02:22]micheleC: @denk: tdebase PR #356 and #359 commit graph is a bit of a mess.
[02:23]micheleC: after looking through carefully, I believe the only two commits required are ed1740b882 and 466b8829b5, which later can be squashed on top of each other
[02:23]micheleC: is that correct?
[02:37]micheleC has left (Kopete 0.12.7 : http://trinitydesktop.org)
[02:38]micheleC has joined
[03:19]micheleC has left (Kopete 0.12.7 : http://trinitydesktop.org)
[03:20]micheleC has joined
[06:48]denk: micheleC: did I do rebase corectly?
[06:54]denk: micheleC: I rechecked the commits, it's correct
[07:04]micheleC: not really, it's a bit of a mess. see the graph online
[07:04]micheleC: https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/graph
[07:04]tde-bot: Page title: Commit Graph - tdebase - TDE Gitea Workspace
[07:04]micheleC: I can fix that, not a problem
[07:04]micheleC: just need to know what is needed
[07:06]micheleC: as far as I understand, PR#359 is build on top of PR#356
[07:06]micheleC: so we can combine them together into a single PR
[07:07]denk: oh, please do it
[07:08]micheleC: so keep only commits ed1740b882 and 466b8829b5 and PR #359 ok?
[07:08]denk: then I can fix some issues
[07:08]denk: yes
[07:08]micheleC: ok, will fix it up soon
[07:08]denk: thanks
[07:08]micheleC: np
[07:11]denk: just call me if you want to increase entropy of the repo :)
[07:16]micheleC: PR 356 closed. both commit on PR 359, rebased on top of current master
[07:24]denk: well, I did something in the local repo, but I'm not sure what exactly I did
[07:24]denk: git pull --rebase on the working branch
[07:33]micheleC: probably better to get rid of local branch and check it out from online again
[07:33]micheleC: at least you are sure everything is aligned
[08:21]denk: t5240% git pull --rebase
[08:21]denk: First, rewinding head to replay your work on top of it...
[08:21]denk: what does it want off me?
[08:22]denk: I set upstream-to for the branch to origin/branch
[08:26]denk: probably, it's correct if the graph does not lie...
[08:29]micheleC: (y)
[08:29]micheleC: you should have two commits in the branch, on top of origin/master
[08:43]denk: https://paste.dilos.org/?0611015e60d12ea8#nyzonvrFso6hzmE2Rs6X5UnDmJWg6QGS3DrfHervvkE=
[08:43]denk: is it correct?
[08:43]tde-bot: Page title: PrivateBin
[09:08]SlavekB has quit (Quit: Kopete 0.12.7 : http://trinitydesktop.org)
[09:32]micheleC: it's correct for the find-poweoff-halt-reboot branch
[09:33]micheleC: the branch sunos-reboot-poweroff has been deleted, so it does not exist anymore remotely
[09:34]micheleC: although technically the commits on that branch exists
[09:34]micheleC: because they have been pushed at some point
[09:41]denk: ok, I will delete sunos-reboot-poweroff branch from my repo
[09:43]denk: one more question: do you delete branches on merge or not?
[09:44]denk: sorry for the dumb questions...
[09:53]micheleC: yes, we delete on merge
[09:53]micheleC: otherwise after a while the repo would be filled with hundreds of branches
[09:57]SlavekB has joined
[13:39]denk: https://paste.dilos.org/?57d49e8a1cdeeaf5#u7zGay1S4bikfcfkO/iwCtLUK/9XyMK9FkXSryXOIrc=
[13:39]tde-bot: Page title: PrivateBin
[13:39]denk: another issue in the deep core
[13:40]denk: it will be a commit to tqt
[14:03]micheleC: ok
[14:05]denk: nice, fixed!
[14:06]micheleC: btw, please note that the branch of PR tdebase#359 needs again to be rebased on top of origin master
[14:12]denk: https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3/pulls/76
[14:12]denk: please review
[14:12]tde-bot: Page title: #76 - SunOS res_ninit() requires a clean structure - tqt3 - TDE Gitea Workspace
[14:12]denk: micheleC: I remember it but Im'm not sure I will do it correctly
[14:22]denk: micheleC: I did git pull --rebase, then git rebase origin/master in the branch: https://paste.dilos.org/?726b68ce626431c7#Bmb/9a9xU67DKE8Jok8YLo8sroh82lihdFcML2hJIHc=
[14:22]denk: is it correct?
[14:33]micheleC: first need to do a git pull --rebase on master branch to be sure also master is updated
[14:34]micheleC: then you do the rebase of the branch
[14:35]micheleC: and then after checking that everything is fine, a git push -f origin HEAD to update the remote branch forcelly
[14:37]denk: I did something on the branch and pushed the result
[14:37]denk: could you check it?
[14:39]denk: if it is correct than I guess I have understood what rebase does
[14:40]denk: like zfs promote
[14:41]micheleC: yes, it is correct :-)
[14:41]denk: happy day :)
[14:41]micheleC: rebase basically moves the branch on top of the commit/branch specified
[14:42]micheleC: as you see, we use it heavily but the result is a very clean and linear git history
[14:42]micheleC: instead of a mix of many branches as I have seen in some other projects
[14:44]akh has quit (Server closed connection)
[14:44]akh has joined
[15:07]denk: SlavekB: did you mean something like this? https://paste.dilos.org/?a3211d1137a5ee53#aTJ1q7OGK1BKnLp/OeOc/3z5buIKChtMqtkYESogmAI=
[15:08]denk: reboot was renamed to test it
[15:09]denk: ah, sorry, it was micheleC
[15:21]micheleC: I think the comment was from Slavek, not from me ;-)
[15:21]micheleC: I am off to bed guys, see you
[15:21]micheleC has quit (Quit: Kopete 0.12.7 : http://trinitydesktop.org)
[15:46]denk: SlavekB: https://paste.dilos.org/?0350a0992dbae366#FSdzsgvX5OzBkDJIg64Lv/e+HDQTteJzadPVtNIt7IU=
[15:51]SlavekB: Yes, it looks good.
[15:57]SlavekB: If we have detected poweroff and reboot commands, conditions such as for OpenBSD, AIX, etc will be possible to omit - just a command that has been detected will simply be used.
[16:19]denk: https://paste.dilos.org/?da4021086cc7168d#vM2S4mfZKRheHMLfg7f27JjWmur7HK+y6sMt/K56i74=
[16:19]tde-bot: Page title: PrivateBin
[16:19]denk: prereview on cmake
[16:20]denk: I'll be back in a hour
[16:56]denk: so, any comments?
[18:34]SlavekB has quit (Quit: TDE Kopete : https://trinitydesktop.org)
[19:32]SlavekB has joined

#tde-devs < 2023/06/14 >