--- Log opened Tue Apr 30 00:00:42 2024
00:26 -!- msc [~msc@user/msc] has quit [Remote host closed the connection]
00:26 -!- msc [~msc@user/msc] has joined #bitcoin-core-builds
01:13 -!- jon_atack [~jonatack@user/jonatack] has joined #bitcoin-core-builds
01:15 -!- jonatack [~jonatack@user/jonatack] has quit [Ping timeout: 260 seconds]
01:38 -!- blockdyor [~blockdyor@dynamic-adsl-94-34-196-193.clienti.tiscali.it] has joined #bitcoin-core-builds
02:50 < vasild> hebasto: just to double check: this conflict
02:50 < vasild> CONFLICT (modify/delete): build_msvc/bitcoin.sln deleted in 9791162134 (cmake: Remove legacy MSVC build system) and modified in HEAD.  Version HEAD of build_msvc/bitcoin.sln left in tree.
02:50 < vasild> I resolve it by git rm build_msvc/bitcoin.sln build_msvc/bitcoind/bitcoind.vcxproj build_msvc/common.init.vcxproj.in build_msvc/libbitcoin_common/libbitcoin_common.vcxproj.in, right?
02:51 < hebasto> right
02:51 < vasild> and this one
02:51 < vasild> CONFLICT (modify/delete): .github/workflows/ci.yml deleted in af998da072 (ci: Test CMake edge cases) and modified in HEAD.  Version HEAD of .github/workflows/ci.yml left in tree.
02:52 < hebasto> the whole `build_msvc` directory was removed
02:52 < vasild> git rm .github/workflows/ci.yml
02:52 < hebasto> same
02:52 < vasild> good
02:59 < vasild> hebasto: here is the tree I end up right after rebase: https://github.com/vasild/bitcoin/tree/cmake-staging
03:00 < vasild> I think it would be better (in general) if first squash the fixup commits and then rebase on master
03:01 < hebasto> the goal was to use autosquash feature though
03:01 < vasild> two separate steps: git rebase -i --autosquash HEAD~98 ; git rebase -i origin/master
03:01 < hebasto> okay
03:01 < vasild> the second one does not need -i
03:02 < hebasto> the diff is only in `build_msvc/fuzz/fuzz.vcxproj` file
03:02 < hebasto> it has to be removed
03:03 < vasild> because there are conflicts on every step trying to apply the same commit a few times, I guess this is because of the fixup. I mean - conflict trying to apply xyz, then I resolve it, git rebase --continue and again: conflict trying to apply xyz
03:03 < vasild> ok, now how to I reorder?
03:04 < vasild> I did not get conflict in build_msvc/fuzz/fuzz.vcxproj
03:05 < hebasto> re -- ok, now how to I reorder? -- first, squash "[FIXUP] ..." commit manually
03:06 < vasild> into what?
03:06 < hebasto> in the previous commits that introduce the touched code
03:07 < vasild> change this to what? https://www.paste.sh/6g36BWC4#pH6Q5Ykgb3mSK6bZlh7vw7Uk
03:11 < vasild> hebasto: ^ 
03:11 < hebasto> changes from `81bde16955 [FIXUP] cmake: Use `pkg-config --static` when building w/ depends` move into `cmake: Add cross-compiling support`...
03:13 < vasild> hebasto: just this?
03:14 < hebasto> and "cmake: Build `bitcoind` executable" ... (I'm reproducing all steps on other machine now)
03:15 < hebasto> I mean, every line change must be moved into the commit, which added that line
03:15 < hebasto> it took a few steps for me
03:17 < hebasto> ... and "build: Generate `share/toolchain.cmake` in depends"
03:18 < vasild> can you post a new list? 
03:18 < hebasto> of what?
03:19 < hebasto> of updated commits?
03:19 < vasild> the new version of this: https://www.paste.sh/6g36BWC4#pH6Q5Ykgb3mSK6bZlh7vw7Uk, I think you can edit it right there
03:20 < hebasto> okay, give me a few minutes
03:22 < hebasto> if you have the same branch just after the first `git rebase ...`command as the PR branch, doesn't it prove that further steps did not introduce any alterations?
03:23 < vasild> but it is not the same
03:24 < hebasto> `build_msvc/fuzz/fuzz.vcxproj` only, right?
03:24 < vasild> git range-diff is 560 lines
03:25 < vasild> do you mean a cumulative diff, disregarding individual commits?
03:25 < hebasto> yes
03:26 < vasild> that is true: diff -u <(git diff 19865a8350..101f3ef12d) <(git diff 19865a8350..04a9657fab)
03:35  * vasild afk
03:36 < hebasto> re -- the new version of this: https://www.paste.sh/6g36BWC4#pH6Q5Ykgb3mSK6bZlh7vw7Uk, I think you can edit it right there -- https://www.paste.sh/PLQ-kKpv#aAzT284MvfD8QCRd1KhBhBFd
05:20 -!- msc_ [~msc@user/msc] has joined #bitcoin-core-builds
05:23 -!- msc [~msc@user/msc] has quit [Ping timeout: 260 seconds]
05:37 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:a0e5:c4cc:1daf:891d] has quit [Remote host closed the connection]
05:41 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:a0e5:c4cc:1daf:891d] has joined #bitcoin-core-builds
05:45 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:a0e5:c4cc:1daf:891d] has quit [Ping timeout: 256 seconds]
06:15 < vasild> hebasto: yes, it is editable
06:16 < vasild> the 2 urls you posted above have the same contents, not sure if this is what you intended
06:16 < hebasto> four commits marked "edit"
06:18 < vasild> ah, ok my bad
07:50 -!- brunoerg [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has joined #bitcoin-core-builds
07:51 -!- brunoerg_ [~brunoerg@143.107.231.30] has joined #bitcoin-core-builds
07:54 -!- brunoerg [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has quit [Ping timeout: 260 seconds]
07:57 -!- brunoerg_ [~brunoerg@143.107.231.30] has quit [Ping timeout: 264 seconds]
07:57 -!- brunoerg [~brunoerg@2001:12d0:2080:6300:10:62:8:cd3b] has joined #bitcoin-core-builds
08:52 -!- brunoerg_ [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has joined #bitcoin-core-builds
08:54 -!- BlueMattMtrxBot [~bluemattm@2620:6e:a000:ce11::30] has quit [Ping timeout: 260 seconds]
08:55 -!- BlueMattMtrxBot [~bluemattm@2620:6e:a000:ce11::30] has joined #bitcoin-core-builds
08:56 -!- brunoerg [~brunoerg@2001:12d0:2080:6300:10:62:8:cd3b] has quit [Ping timeout: 268 seconds]
09:46 -!- brunoerg_ [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has quit [Remote host closed the connection]
09:50 -!- brunoerg [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has joined #bitcoin-core-builds
09:55 -!- brunoerg [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has quit [Ping timeout: 255 seconds]
10:29 -!- brunoerg [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has joined #bitcoin-core-builds
10:42 -!- brunoerg [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has quit [Remote host closed the connection]
11:13 -!- brunoerg [~brunoerg@143.107.231.30] has joined #bitcoin-core-builds
11:18 -!- brunoerg [~brunoerg@143.107.231.30] has quit [Ping timeout: 268 seconds]
12:02 -!- gribble [~gribble@bitcoin/bot/gribble] has quit [Remote host closed the connection]
12:10 -!- gribble [~gribble@bitcoin/bot/gribble] has joined #bitcoin-core-builds
12:10 -!- pablomartin4btc [~pablomart@185.216.146.251] has joined #bitcoin-core-builds
12:16 -!- jon_atack [~jonatack@user/jonatack] has quit [Ping timeout: 252 seconds]
12:17 -!- jonatack [~jonatack@user/jonatack] has joined #bitcoin-core-builds
12:21 -!- jonatack [~jonatack@user/jonatack] has quit [Ping timeout: 256 seconds]
12:22 -!- jonatack [~jonatack@user/jonatack] has joined #bitcoin-core-builds
12:31 -!- blockdyor [~blockdyor@dynamic-adsl-94-34-196-193.clienti.tiscali.it] has quit [Quit: My iMac has gone to sleep. ZZZzzz…]
13:19 -!- blockdyor [~blockdyor@dynamic-adsl-94-34-196-193.clienti.tiscali.it] has joined #bitcoin-core-builds
13:41 -!- brunoerg [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has joined #bitcoin-core-builds
14:15 -!- vasild [~vd@user/vasild] has quit [Remote host closed the connection]
14:16 -!- vasild [~vd@user/vasild] has joined #bitcoin-core-builds
14:25 -!- blockdyor [~blockdyor@dynamic-adsl-94-34-196-193.clienti.tiscali.it] has quit [Quit: My iMac has gone to sleep. ZZZzzz…]
14:38 -!- brunoerg [~brunoerg@2001:12d0:2080:2800:172:26:fffd:8d3b] has quit [Remote host closed the connection]
14:39 -!- pablomartin4btc [~pablomart@185.216.146.251] has quit [Ping timeout: 255 seconds]
14:57 -!- pablomartin4btc [~pablomart@185.216.146.250] has joined #bitcoin-core-builds
15:48 -!- msc_ [~msc@user/msc] has quit [Remote host closed the connection]
15:49 -!- msc [~msc@user/msc] has joined #bitcoin-core-builds
15:54 -!- msc [~msc@user/msc] has quit [Ping timeout: 260 seconds]
16:39 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has joined #bitcoin-core-builds
16:46 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has quit [Ping timeout: 255 seconds]
17:01 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has joined #bitcoin-core-builds
17:06 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has quit [Ping timeout: 260 seconds]
17:16 -!- msc [~msc@user/msc] has joined #bitcoin-core-builds
17:20 -!- msc [~msc@user/msc] has quit [Ping timeout: 260 seconds]
17:31 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has joined #bitcoin-core-builds
17:37 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has quit [Ping timeout: 260 seconds]
17:51 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has joined #bitcoin-core-builds
17:56 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has quit [Ping timeout: 268 seconds]
18:09 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has joined #bitcoin-core-builds
18:14 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has quit [Ping timeout: 256 seconds]
18:26 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has joined #bitcoin-core-builds
19:31 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has quit [Ping timeout: 255 seconds]
19:34 -!- pablomartin4btc [~pablomart@185.216.146.250] has quit [Ping timeout: 252 seconds]
19:54 -!- msc [~msc@user/msc] has joined #bitcoin-core-builds
19:59 -!- msc [~msc@user/msc] has quit [Ping timeout: 260 seconds]
20:00 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has joined #bitcoin-core-builds
20:05 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has quit [Ping timeout: 255 seconds]
20:18 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has joined #bitcoin-core-builds
20:43 -!- brunoerg [~brunoerg@2804:14c:3bfb:37:3cf1:dd4d:430:a95b] has quit [Ping timeout: 256 seconds]
20:55 -!- msc [~msc@user/msc] has joined #bitcoin-core-builds
20:59 -!- msc [~msc@user/msc] has quit [Ping timeout: 260 seconds]
21:56 -!- msc [~msc@user/msc] has joined #bitcoin-core-builds
22:00 -!- msc [~msc@user/msc] has quit [Ping timeout: 260 seconds]
22:57 -!- msc [~msc@user/msc] has joined #bitcoin-core-builds
23:01 -!- msc [~msc@user/msc] has quit [Ping timeout: 260 seconds]
23:58 -!- msc [~msc@user/msc] has joined #bitcoin-core-builds
--- Log closed Wed May 01 00:00:43 2024