#tde-devs < 2023/06/13 >
[00:55]micheleC has joined
[02:16]micheleC: @denk: please rebase your tdebase PR#360 on top of origin/master. If you don't know how to do it, please let me know.
[06:55]denk: micheleC: I don't know how to do it correctly
[06:58]micheleC: I can do that for you if you wish
[06:58]micheleC: then next time remember to always create PR on top of existing origin/master
[07:00]denk: I do pull on master branch before doing something in a tree
[07:00]denk: probably I should also do rebase somewhere
[07:00]micheleC: git pull --rebase
[07:00]denk: but where exactly?
[07:00]micheleC: before doing any change is the best
[07:00]denk: git checkout master; git pull --rebase?
[07:01]micheleC: (y)
[07:01]micheleC: but make sure that master is aligned with origin/master
[07:01]micheleC: because if you have made local commits on master, then it may differ
[07:02]denk: t5240% git pull --rebase
[07:02]denk: Already up to date.
[07:02]denk: Current branch master is up to date.
[07:02]denk: like it was yesterday
[07:03]micheleC: looks like PR #360 was build on top of PR #359 branch
[07:03]micheleC: https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/graph
[07:03]tde-bot: Page title: Commit Graph - tdebase - TDE Gitea Workspace
[07:03]micheleC: you can see commit of PR#360 is right after commits on PR#359
[07:03]micheleC: so it was not on origin/master
[07:04]denk: how to fix it?
[07:04]denk: find-poweroff-halt-reboot
[07:04]denk: kcontrol-tdm-users-sunos
[07:04]denk: * master
[07:05]denk: my branches
[07:05]micheleC: you need to create new branch on top of master, then do the same changes of commit a56363804a
[07:05]tde-bot: Commit History
[07:05]tde-bot: https://www.trinitydesktop.org/patches/
[07:05]micheleC: then create a new PR from the new branch and delete the old one
[07:05]micheleC: but I can fix up the existing one if you wish for this time
[07:06]denk: yeah, you can fix it, but one time in the future I will break it again
[07:06]denk: it's time to understand how to fix it
[07:08]micheleC: (y)
[07:08]micheleC: git log --graph --oneline --decorate --all
[07:08]micheleC: this will print the local structure of your branches
[07:10]micheleC: can you print the result here?
[07:10]denk: https://paste.dilos.org/?4e088898c6678616#mA+f38AmYW0WeYPoNweWsvQhL+gtwiSHbXhuvWMNTsY=
[07:10]tde-bot: Page title: PrivateBin
[07:14]micheleC: uhm, the link seems not working
[07:14]denk: * a56363804 (origin/kcontrol-tdm-users-sunos, kcontrol-tdm-users-sunos) SunOS UID scheme
[07:14]denk: * 466b8829b (HEAD -> find-poweroff-halt-reboot, origin/find-poweroff-halt-reboot) find system tools instead of hardcode them
[07:14]denk: * ed1740b88 (origin/sunos-reboot-poweroff, sunos-reboot-poweroff) fix patches for SunOS based systems
[07:14]denk: | * 0e6f6f70f (origin/r14.1.x) Drop TQT_NO_COMPAT code
[07:14]micheleC: sorry, working. firefox craziness :-(
[07:15]micheleC: we need to use interactive rebasing
[07:16]micheleC: from "kcontrol-tdm-users-sunos" branch, type "git rebase -i @~3"
[07:16]micheleC: this should open an editor window with 3 commits listed at the top
[07:17]denk: yes, it is
[07:17]denk: pick ed1740b88 fix patches for SunOS based systems
[07:17]denk: pick 466b8829b find system tools instead of hardcode them
[07:17]denk: pick a56363804 SunOS UID scheme
[07:17]micheleC: we want to keep only commit a56363804a in this brancj
[07:17]tde-bot: Commit History
[07:17]tde-bot: https://www.trinitydesktop.org/patches/
[07:18]micheleC: so replace "pick" with "drop" for the first two lines
[07:18]denk: removed two lines
[07:18]micheleC: nope, don't remove the lines. Change "pick" to "drop"
[07:18]denk: ok
[07:18]micheleC: then save and exit.
[07:19]denk: pick ed1740b88 fix patches for SunOS based systems
[07:19]denk: pick 466b8829b find system tools instead of hardcode them
[07:19]denk: pick a56363804 SunOS UID scheme
[07:19]denk: oops
[07:19]denk: t5240% git rebase -i @~3
[07:19]denk: Successfully rebased and updated refs/heads/kcontrol-tdm-users-sunos.
[07:19]micheleC: drop-drop-pick
[07:19]denk: another feature of konsole which I'd like to fix
[07:20]micheleC: drop ed1740b88 fix patches for SunOS based systemsdrop 466b8829b find system tools instead of hardcode thempick a56363804 SunOS UID scheme
[07:20]micheleC: drop ed1740b88 fix patches for SunOS based systems
[07:20]micheleC: drop 466b8829b find system tools instead of hardcode them
[07:20]micheleC: pick a56363804 SunOS UID scheme
[07:20]micheleC: like this
[07:21]micheleC: this will remove the first two commits and keep the last one only, with a new hash
[07:21]denk: should I switch to some other branch?
[07:22]micheleC: no stay on the same branch, but make sure the two unwanted commits are gone
[07:22]micheleC: git log HEAD --oneline -n 10
[07:22]micheleC: you should see only "SunOS UID scheme" and then "Update translation files"
[07:22]denk: t5240% git log HEAD --oneline -n 10
[07:22]denk: d32c28a18 (HEAD -> kcontrol-tdm-users-sunos) SunOS UID scheme
[07:22]denk: 90b19e21c Update translation files
[07:22]micheleC: (y)
[07:23]micheleC: now run "git rebase -S origin/master"
[07:23]micheleC: -S not needed without GPG key, replace with -s
[07:23]micheleC: and you should get something like:
[07:23]micheleC: a13f987c0 (13 hours ago) Denis Kozadaev SunOS UID scheme (HEAD -> kcontrol-tdm-users-sunos)
[07:23]micheleC: afb81ac10 (4 days ago) Michele Calgaro Drop TQT_NO_COMPAT code (origin/master, master)
[07:25]micheleC: if you run git log HEAD --oneline -n 10
[07:26]denk: huh, it's broken again in the middle
[07:26]denk: I just installed missing gpg
[07:26]denk: t5240% git log HEAD --oneline -n 10
[07:26]denk: d32c28a18 (HEAD -> kcontrol-tdm-users-sunos) SunOS UID scheme
[07:26]denk: 90b19e21c Update translation files
[07:26]denk: shit...
[07:27]denk: t5240% git rebase -s origin/master
[07:27]denk: fatal: It seems that there is already a rebase-apply directory, and
[07:27]denk: I wonder if you are in the middle of another rebase. If that is the
[07:27]denk: case, please try
[07:27]denk: continue, abort, skip?
[07:27]micheleC: git rebase --abort
[07:28]denk: and once again?
[07:28]micheleC: git status first
[07:28]micheleC: to check you are clean
[07:28]denk: t5240% git status
[07:28]denk: On branch kcontrol-tdm-users-sunos
[07:28]denk: nothing to commit, working tree clean
[07:29]micheleC: so now you should have all three commits as before right?
[07:29]denk: yep
[07:29]denk: git rebase -s origin/master?
[07:30]micheleC: first let's remove the two unwanted commits
[07:30]micheleC: git rebase -i @~3
[07:30]micheleC: then drop-drop-pick as said before
[07:30]micheleC: save and exit.
[07:30]micheleC: git status
[07:31]micheleC: and git log HEAD --oneline -n 10
[07:31]denk: pick ce84a0c64 Update translation template.
[07:31]denk: pick 90b19e21c Update translation files
[07:31]denk: pick d32c28a18 SunOS UID scheme
[07:31]denk: I see this in the editor
[07:31]denk: wrong?
[07:31]micheleC: you have to edit "pick" in the first two lines
[07:31]micheleC: and type "drop"
[07:31]micheleC: as I pasted earlier
[07:32]denk: ok, saved
[07:32]micheleC: like this:
[07:32]micheleC: drop ed1740b88 fix patches for SunOS based systems
[07:32]micheleC: drop 466b8829b find system tools instead of hardcode them
[07:32]micheleC: pick a56363804 SunOS UID scheme
[07:32]micheleC: git log HEAD --oneline -n 10
[07:33]denk: https://paste.dilos.org/?2c06b58047211c9d#115Xp++omL47eDE9Xu4TRzbkKvHPtElqKS1Wwp+dxV8=
[07:33]tde-bot: Page title: PrivateBin
[07:33]micheleC: uhm nope
[07:34]micheleC: are you on the kcontrol-tdm-users-sunos branch?
[07:34]denk: yes
[07:34]denk: * kcontrol-tdm-users-sunos
[07:35]micheleC: git status
[07:35]denk: t5240% git status
[07:35]denk: On branch kcontrol-tdm-users-sunos
[07:35]denk: nothing to commit, working tree clean
[07:36]micheleC: ah I understand what happened I think
[07:36]micheleC: and why your second commit is "Add TDE release notes to khelpcenter home page. This resolves issue #332"
[07:37]micheleC: we need to start again
[07:37]micheleC: git checkout origin/kcontrol-tdm-users-sunos
[07:37]micheleC: git log HEAD --oneline -n 10
[07:37]micheleC: you should have 3 commits on top, the first two we want to remove
[07:38]micheleC: git rebase -i @~3
[07:38]denk: t5240% git log HEAD --oneline -n 10
[07:38]denk: a56363804 (HEAD, origin/kcontrol-tdm-users-sunos) SunOS UID scheme
[07:38]denk: 466b8829b (origin/find-poweroff-halt-reboot, find-poweroff-halt-reboot) find system tools instead of hardcode them
[07:38]denk: ed1740b88 (origin/sunos-reboot-poweroff, sunos-reboot-poweroff) fix patches for SunOS based systems
[07:38]denk: 90b19e21c Update translation files
[07:38]micheleC: (y)
[07:38]micheleC: git rebase -i @~3
[07:38]micheleC: then:
[07:38]micheleC: drop ed1740b88 fix patches for SunOS based systems
[07:38]micheleC: drop 466b8829b find system tools instead of hardcode them
[07:38]micheleC: pick a56363804 SunOS UID scheme
[07:38]denk: yes, saved
[07:38]micheleC: git log HEAD --oneline -n 10
[07:39]denk: t5240% git log HEAD --oneline -n 10
[07:39]denk: 417628f35 (HEAD) SunOS UID scheme
[07:39]denk: 90b19e21c Update translation files
[07:39]micheleC: (y)
[07:39]micheleC: git status
[07:39]denk: t5240% git status
[07:39]denk: HEAD detached from origin/kcontrol-tdm-users-sunos
[07:39]denk: nothing to commit, working tree clean
[07:39]micheleC: (y)
[07:40]micheleC: git rebase -s origin/master
[07:40]micheleC: git log HEAD --oneline -n 10
[07:40]denk: t5240% git log HEAD --oneline -n 10
[07:40]denk: 417628f35 (HEAD) SunOS UID scheme
[07:40]denk: 90b19e21c Update translation files
[07:41]denk: rebase said
[07:41]denk: You are not currently on a branch.
[07:41]denk: Please specify which branch you want to rebase against.
[07:41]micheleC: yeah, I just noticed the problem
[07:42]micheleC: git status should say something like:
[07:42]micheleC: On branch kcontrol-tdm-users-sunos
[07:42]micheleC: Your branch and 'origin/kcontrol-tdm-users-sunos' have diverged,
[07:42]micheleC: and have 1 and 3 different commits each, respectively.
[07:42]micheleC: (use "git pull" to merge the remote branch into yours)
[07:42]micheleC: nothing to commit, working tree clean
[07:42]micheleC: that's because of the git checkout we did before
[07:42]micheleC: so we need one little extra step and repeat
[07:43]micheleC: first get rid of the branch
[07:43]micheleC: switch to master branch
[07:44]denk: t5240% git branch
[07:44]denk: * (HEAD detached from origin/kcontrol-tdm-users-sunos)
[07:44]denk: checkout to master?
[07:44]micheleC: switch to master branch and then git branch -D kcontrol-tdm-users-sunos
[07:44]micheleC: to clean your local branch
[07:45]denk: ok, deleted
[07:46]micheleC: git checkout kcontrol-tdm-users-sunos
[07:46]denk: ranch 'kcontrol-tdm-users-sunos' set up to track remote branch 'kcontrol-tdm-users-sunos' from 'origin'.
[07:46]denk: Switched to a new branch 'kcontrol-tdm-users-sunos'
[07:47]micheleC: git branch --set-upstream-to=origin/kcontrol-tdm-users-sunos
[07:47]denk: Branch 'kcontrol-tdm-users-sunos' set up to track remote branch 'kcontrol-tdm-users-sunos' from 'origin'.
[07:48]micheleC: git rebase -i @~3
[07:48]micheleC: and drop-drop-pick as before
[07:48]denk: Successfully rebased and updated refs/heads/kcontrol-tdm-users-sunos.
[07:49]micheleC: git status
[07:49]denk: On branch kcontrol-tdm-users-sunos
[07:49]denk: Your branch and 'origin/kcontrol-tdm-users-sunos' have diverged,
[07:49]denk: and have 1 and 3 different commits each, respectively.
[07:49]micheleC: git log HEAD --oneline -n 10
[07:50]denk: t5240% git log HEAD --oneline -n 10
[07:50]denk: 307aba690 (HEAD -> kcontrol-tdm-users-sunos) SunOS UID scheme
[07:50]denk: 90b19e21c Update translation files
[07:50]micheleC: git rebase -s origin/master
[07:50]denk: Successfully rebased and updated refs/heads/kcontrol-tdm-users-sunos.
[07:50]micheleC: git log HEAD --oneline -n 10
[07:51]denk: a56363804 (HEAD -> kcontrol-tdm-users-sunos, origin/kcontrol-tdm-users-sunos) SunOS UID scheme
[07:51]denk: 466b8829b (origin/find-poweroff-halt-reboot, find-poweroff-halt-reboot) find system tools instead of hardcode them
[07:51]denk: ed1740b88 (origin/sunos-reboot-poweroff, sunos-reboot-poweroff) fix patches for SunOS based systems
[07:51]micheleC: uhm
[07:52]micheleC: should be something like this:
[07:52]micheleC: bcd2bfcdc (14 hours ago) Denis Kozadaev SunOS UID scheme (HEAD -> kcontrol-tdm-users-sunos)
[07:52]micheleC: afb81ac10 (4 days ago) Michele Calgaro Drop TQT_NO_COMPAT code (origin/master, master)
[07:52]micheleC: did you rebase on master or origin/master
[07:53]denk: yes, I did exactly what you typed
[07:53]denk: copy-paste
[07:53]micheleC: is your master on commit afb81ac10?
[07:53]tde-bot: [TGW][tdebase] Drop TQT_NO_COMPAT code ยท afb81ac10b
[07:53]tde-bot: https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/commit/afb81ac10b
[07:54]denk: how to check it?
[07:54]micheleC: switch to master branch
[07:54]micheleC: and git log HEAD --oneline -n 10
[07:54]denk: t5240% git log HEAD --oneline -n 10
[07:54]denk: afb81ac10 (HEAD -> master, origin/master, origin/HEAD) Drop TQT_NO_COMPAT code
[07:54]denk: 74eb1d78a Translated using Weblate (Czech)
[07:54]micheleC: it will list the commit your master is on
[07:54]micheleC: (y)
[07:55]micheleC: I did the same commands here and the rebase on master was correct
[07:55]micheleC: I used -S instead of -s, that is the only difference
[07:56]denk: than fix it, I run the script to clean it all
[07:56]micheleC: ah "-s" is wrong, it's not the same as "-s" in git commit
[07:57]denk: hehe
[07:57]micheleC: if you want, you could try git rebase origin/master
[07:57]micheleC: from the branch
[07:57]micheleC: but you may have to redo all the steps
[07:58]micheleC: or I can force push the changes for this time
[07:58]denk: yes, we need to complete it
[07:58]micheleC: ok, let me push them. hopefully it won't destry the other branches :-)
[07:58]denk: rebase:
[07:58]denk: First, rewinding head to replay your work on top of it...
[07:58]denk: Applying: fix patches for SunOS based systems
[07:58]denk: Applying: find system tools instead of hardcode them
[07:58]denk: Applying: SunOS UID scheme
[07:59]denk: log:
[07:59]denk: 25550771d (HEAD -> kcontrol-tdm-users-sunos) SunOS UID scheme
[07:59]denk: 02b0a0630 find system tools instead of hardcode them
[07:59]denk: 37bb32bfa fix patches for SunOS based systems
[07:59]denk: afb81ac10 (origin/master, origin/HEAD, master) Drop TQT_NO_COMPAT code
[07:59]micheleC: https://mirror.git.trinitydesktop.org/gitea/TDE/tdebase/graph
[07:59]tde-bot: Page title: Commit Graph - tdebase - TDE Gitea Workspace
[07:59]micheleC: I just pushed the changes. please check all is as it should :-)
[08:00]micheleC: seems good to me
[08:00]micheleC: PR#359 has 2 commits and PR#360 one
[08:00]denk: thank you that you clean my shit :)
[08:01]micheleC: just noticed that PR#359 is built on top of PR #356, which has not been merged yet
[08:02]denk: I need to do some fixes as you suggested
[08:03]micheleC: (y)
[08:03]micheleC: I can merge 360 for the time being
[08:04]denk: if it is ready to merge, do it
[08:06]denk: btw, if you have some questions about zfs, just ask, and thanks for the help
[08:06]micheleC: I think we can make small change in PR#360
[08:07]micheleC: do you want me to comment here or on the PR?
[08:07]micheleC: @help: no worries, it was an easy one :-)
[08:07]denk: on the PR, I need to do some job
[08:07]micheleC: (y)
[08:08]micheleC: actually it is ok
[08:08]micheleC: I will merge
[08:12]micheleC: merged and backport
[08:14]denk: 356 && 359 should be replaced by one fixed commit?
[08:14]micheleC: and rebased on top of origin/master
[08:15]denk: there is 11:15 overe here, in 5-6 hours I will defecate to the git once again :)
[08:16]micheleC: (y)
[08:16]micheleC: start from PR #356
[08:16]micheleC: rebase on top of current origin/master
[08:16]denk: yep, by the log from the channel
[08:17]micheleC: and fix it the code
[08:17]micheleC: the we merge that first
[08:17]micheleC: and then work on #359
[08:54]SlavekB has quit (Quit: Kopete 0.12.7 : http://trinitydesktop.org)
[09:56]SlavekB has joined
[10:50]micheleC has quit (Quit: Kopete 0.12.7 : http://trinitydesktop.org)
[14:09]micheleC has joined
[14:09]micheleC has quit (Quit: Kopete 0.12.7 : http://trinitydesktop.org)
[18:22]SlavekB has quit (Quit: TDE Kopete : https://trinitydesktop.org)
[23:20]SlavekB has joined

#tde-devs < 2023/06/13 >