#linuxcnc-devel Logs

May 31 2022

#linuxcnc-devel Calendar

02:25 AM silopolis[m]: Morning
02:31 AM silopolis[m]: GStat doc mentions a state-tag branch in the works that should solve issues with status points lagging behind interpreter.... Only 'state-tag*' branches that can be found in repo are several years old. Has this been merged or is it abandonned ?
02:39 AM pere: good morning.
04:54 AM -!- #linuxcnc-devel mode set to +v by ChanServ
06:37 AM hansu: pere Hi
06:37 AM pere: hansu: hi. you can check out <URL: https://github.com/petterreinholdtsen/linuxcnc/ > branch test-rebase to see my rebase. I did not try to figure out adoc conflicts between master and docs-devel, and simply picked the master version when there was a conflict.
06:40 AM silopolis[m]: Well, feeling like all this should deserve a bit more care ๐Ÿคจ
06:59 AM hansu: pere What about syncing the 9 files which differs after merging to docs-devel in one commit?
06:59 AM hansu: Would not be a perfect rebase, but I think much better than the current state.
07:01 AM hansu: There have been more than 9 conflicts, right?
07:01 AM hansu: Maybe I can have a try as well today in the evening with special attention on the 9 differing files.
07:08 AM silopolis[m]: <hansu> "Maybe I can have a try as well..." <- Can I help ?
07:09 AM silopolis[m]: Would you squash before or after rebase ?
07:09 AM silopolis[m]: I can work on one or the other this afternoon
07:10 AM pere: hansu27: many possibilities for those included to try to work out the exact changes done to the adoc files.
07:11 AM pere: silopolis[m]: squashing before might reduce the number of conflicting commits, but most likely will not reduce the amount of text to read through.
07:13 AM silopolis[m]: Like asked in mail, what would be the git command to get the list of modified adoc files since branching or last rebase ?
07:16 AM pere: silopolis[m]: replied to the email with instructions.
07:20 AM hansu27: But squashing without conflicts wouldn't work I think
07:53 AM pere: hansu27: as there are real conflicts between master and docs-devel, squashing commits in docs-devel would only affect how many conflict commits to resolve, not the amount of conflicts.
08:00 AM hansu27: I mean even if one wants to squash commits, this would also result in resolving conflicts
08:00 AM hansu27: At least this happened when I tried this last time
08:01 AM pere: hansu27: only if you try to squash the wrong commits...
08:01 AM pere: I assumed one would squash commits that belong together, and those should not give any conflicts if done in the correct order.
08:46 AM hansu27: Hmm
08:48 AM hansu27: silopolis[m] You can also try to rebase docs-devel with "carefully handling of the conflicts" if you want ;-)
08:48 AM silopolis[m]: just started a rebase with massive squashing by author and matter
08:48 AM silopolis[m]: hansu27: giving it a try ATM ! ๐Ÿ™‚
09:13 AM hansu27: Don't be to aggressive - even a straight history of 100 commits like Petters rebase looks quite ok
09:13 AM hansu27: (y)
10:53 AM silopolis[m]: pere: https://github.com/LinuxCNC/linuxcnc/pull/1750
01:55 PM -!- #linuxcnc-devel mode set to +v by ChanServ
04:08 PM -!- #linuxcnc-devel mode set to +v by ChanServ
05:51 PM -!- #linuxcnc-devel mode set to +v by ChanServ
08:56 PM -!- #linuxcnc-devel mode set to +v by ChanServ