| 2023-06-21 |
| ← fling left | 00:00 |
| → fling joined | 00:04 |
| → [mct] joined | 00:04 |
| ← jklfds_ left | 00:04 |
| ← thuna` left | 00:04 |
| → money joined | 00:07 |
| ← dvanloon3 left | 00:08 |
| → dvanloon3 joined | 00:09 |
| ← oprypin left | 00:14 |
| ← dvanloon3 left | 00:19 |
| → dvanloon3 joined | 00:20 |
| ← Gary_Sinise left | 00:21 |
| → gsi_ joined | 00:23 |
| ← gsi left | 00:25 |
| → mven8 joined | 00:36 |
| ← mven left | 00:40 |
| mven8 → mven | 00:40 |
| ← peas left | 00:40 |
| ← YuGiOhJCJ left | 00:40 |
| → peas joined | 00:42 |
| ← dsrt^ left | 00:45 |
| → jklfds_ joined | 00:46 |
| ← Xenguy left | 00:49 |
| → YuGiOhJCJ joined | 00:50 |
| → bywaterloo joined | 00:51 |
| ← jklfds_ left | 00:52 |
| ← Seveas left | 00:54 |
| → Seveas joined | 00:54 |
| ← raffaele__ left | 00:58 |
| → raffaele__ joined | 00:58 |
| ← clime left | 00:59 |
| ← rama left | 01:01 |
| ← dvanloon3 left | 01:01 |
| → rama joined | 01:02 |
| ← rama left | 01:02 |
| → rama joined | 01:02 |
| → dvanloon3 joined | 01:04 |
| ← alip left | 01:05 |
| ← g2anj left | 01:05 |
| → jklfds_ joined | 01:06 |
| → g2anj joined | 01:06 |
| → alip joined | 01:07 |
| ← dvanloon3 left | 01:08 |
| → dvanloon3 joined | 01:09 |
| ← jklfds_ left | 01:10 |
| → bambanxx joined | 01:11 |
| ← njt left | 01:14 |
| → njt joined | 01:14 |
| → kaisyu joined | 01:20 |
| ← goldfish left | 01:23 |
| ← [mct] left | 01:24 |
| ← arescorpio left | 01:25 |
| → Atque_ joined | 01:25 |
| ← Atque left | 01:25 |
| ← bn_work left | 01:28 |
| → bn_work joined | 01:28 |
| ← thiago left | 01:29 |
| → [mct] joined | 01:30 |
| ← Notgnoshi left | 01:33 |
| Atque_ → Atque | 01:33 |
| → wakaflaka joined | 01:39 |
| → Xenguy joined | 01:39 |
|
wakaflaka
| hi. is there a way to enable passwords again? so confused about this ssh key stuff | 01:40 |
| → Notgnoshi joined | 01:42 |
|
wakaflaka
| (1. generated a new pair, 2. added the public key to github, 3. ssh -T [email@hidden.address] You've successfully authenticated, but GitHub does not provide shell access., 4. git push still asks for a pasword and if i dont give it one it will also fail) | 01:43 |
| ← rama left | 01:44 |
|
wakaflaka
| nvm | 01:45 |
|
| gtg | 01:45 |
| ← dvanloon3 left | 01:47 |
| → dvanloon3 joined | 01:47 |
| ← vysn left | 01:49 |
| ← dvanloon3 left | 01:52 |
| → dvanloon3 joined | 01:53 |
| ← Notgnoshi left | 01:56 |
| → Notgnoshi joined | 01:56 |
| ← Notgnoshi left | 01:57 |
| ← stockholm left | 01:57 |
| → stockholm joined | 01:57 |
| ← [mct] left | 01:58 |
| → [mct] joined | 01:58 |
| ← dvanloon3 left | 02:01 |
| → dvanloon3 joined | 02:04 |
| ← moldorcoder7 left | 02:05 |
| → rama joined | 02:08 |
| ← rama left | 02:13 |
| ← bloody left | 02:14 |
| → nate2 joined | 02:15 |
| → hbautista joined | 02:16 |
| → jkatnight joined | 02:16 |
| ← raffaele__ left | 02:18 |
| → raffaele__ joined | 02:18 |
| ← FinnElija left | 02:20 |
| → finn_elija joined | 02:20 |
| finn_elija → FinnElija | 02:20 |
| ← jkatnight left | 02:21 |
| → falafel joined | 02:27 |
|
parsnip
| what do you say to a group that is defening plagiarism with, "well git best practice is don't rebase" | 02:28 |
|
| *defending | 02:28 |
|
| or rather, "claiming authorship", etc | 02:28 |
| ← Atque left | 02:28 |
|
parsnip
| "applying arbitrary licenses" | 02:28 |
| → rama joined | 02:30 |
|
parsnip
| meanwhile other github users are forking and force pushing main to select points on the tree that they find to their benefit | 02:31 |
|
| and so if i comment on this, the first group exclaims, "i hear you don't like forks!", but the irony is lost on them | 02:32 |
| ← JanC left | 02:34 |
| → JanC joined | 02:34 |
| ← rama left | 02:34 |
| → JanC_ joined | 02:38 |
| JanC → Guest3568 | 02:39 |
| JanC_ → JanC | 02:39 |
|
parsnip
| i guess git documentation does not so much say to never force push. rather, it has details about how to deal with it | 02:39 |
| ← Guest3568 left | 02:39 |
| ← gas51627 left | 02:40 |
| → jkatnight joined | 02:40 |
| → JanC_ joined | 02:42 |
| JanC → Guest7998 | 02:43 |
| JanC_ → JanC | 02:43 |
| ← Guest7998 left | 02:44 |
| ← jkatnight left | 02:45 |
| → lucasta joined | 02:47 |
| → Rashad joined | 02:48 |
| ← JanC left | 02:49 |
| → JanC_ joined | 02:49 |
| JanC_ → JanC | 02:49 |
| ← stenno left | 02:52 |
|
EdFletcher
| i mean "well git best practice is don't rebase" is just objectively false, rebase is a very powerful tool. and indeed force-push is too, when used properly and responsibly. "with great power comes great responsbility" and all that jazz | 02:53 |
|
| in fact, we recently got an incredible feature that makes rebase - and specifically the stacked-branch workflow it enables - even more powerful, `--update-refs` | 02:54 |
| ← JanC left | 03:01 |
| ← dvanloon3 left | 03:01 |
| → JanC joined | 03:02 |
| ← squirrel left | 03:02 |
| → dvanloon3 joined | 03:06 |
| ← bret left | 03:15 |
| ← nate2 left | 03:18 |
| ← bambanxx left | 03:19 |
| ← cafkafk left | 03:22 |
| ← dvanloon3 left | 03:22 |
| → dvanloon3 joined | 03:24 |
| ← Timvde left | 03:24 |
| → Timvde joined | 03:24 |
|
jast
| parsnip: life pro tip, don't argue with people who refuse to change their minds anyway | 03:25 |
| → cafkafk joined | 03:25 |
| ← money left | 03:27 |
| ← kaisyu left | 03:30 |
| → Gary_Sinise joined | 03:30 |
| → Atque joined | 03:36 |
| ← elastic_dog left | 03:37 |
| ← dvanloon3 left | 03:37 |
| ← gast0n left | 03:38 |
| ← peas left | 03:39 |
| → dvanloon3 joined | 03:40 |
| ← jaeckel left | 03:46 |
| → jaeckel joined | 03:47 |
| → elastic_dog joined | 03:48 |
| → dogui joined | 03:51 |
| ← Rashad left | 03:53 |
| ← dvanloon3 left | 04:01 |
| → jmd joined | 04:04 |
| → dvanloon3 joined | 04:05 |
| ← dvanloon3 left | 04:09 |
| → dvanloon3 joined | 04:12 |
| → jkatnight joined | 04:16 |
| ← jkatnight left | 04:20 |
| → gep joined | 04:20 |
| ← skapata left | 04:23 |
| ← hbautista left | 04:37 |
| → stenno joined | 04:48 |
| → rama joined | 04:52 |
| ← stenno left | 04:53 |
| ← dvanloon3 left | 04:53 |
| → dvanloon3 joined | 04:55 |
| ← rama left | 04:56 |
| ← lucasta left | 04:59 |
| → magic_ninja joined | 05:00 |
| ← falafel left | 05:03 |
| → coot joined | 05:07 |
| → maret joined | 05:07 |
| ← dvanloon3 left | 05:09 |
| ← maret left | 05:09 |
| → dvanloon3 joined | 05:10 |
| ← cafkafk left | 05:12 |
| → jkatnight joined | 05:15 |
| → jacobk joined | 05:16 |
| ← theodorc left | 05:16 |
| → theodorc joined | 05:17 |
| → cafkafk joined | 05:18 |
| ← jkatnight left | 05:19 |
| ← CodeAgain left | 05:20 |
| ← vikonen left | 05:21 |
| → vikonen joined | 05:21 |
| ← Gary_Sinise left | 05:21 |
| → iomari891 joined | 05:24 |
| → jklfds_ joined | 05:24 |
| ← dvanloon3 left | 05:25 |
| → dvanloon3 joined | 05:26 |
| ← jklfds_ left | 05:29 |
| → CodeAgain joined | 05:34 |
| ← m1dnight left | 05:39 |
| → thiago joined | 05:40 |
| → rama joined | 05:41 |
| ← dvanloon3 left | 05:42 |
| → dvanloon3 joined | 05:42 |
| ← FLHerne left | 05:43 |
| ← Linkandzelda left | 05:43 |
| → FLHerne joined | 05:43 |
| → Linkandzelda joined | 05:44 |
| ← rama left | 05:45 |
| → maret joined | 05:45 |
| ← cafkafk left | 05:46 |
| → cafkafk joined | 05:46 |
| ← crabbedhaloablut left | 05:47 |
| ← memset left | 05:48 |
| → memset joined | 05:48 |
| → filePeter joined | 05:49 |
| ← maret left | 05:52 |
| ← Guest9377 left | 05:55 |
| ← dvanloon3 left | 05:56 |
| rkta_ → rkta | 05:56 |
| → feriman joined | 05:57 |
| ← bywaterloo left | 05:58 |
| → dvanloon3 joined | 05:59 |
| → weedmic joined | 06:00 |
| ← dvanloon3 left | 06:02 |
| → dvanloon3 joined | 06:04 |
| → clime joined | 06:09 |
| ← dvanloon3 left | 06:09 |
| → dvanloon3 joined | 06:10 |
| → sa0 joined | 06:10 |
| ← thiago left | 06:10 |
| ← dvanloon3 left | 06:13 |
| → han-solo joined | 06:15 |
| → dvanloon3 joined | 06:16 |
| → rfuentess joined | 06:18 |
| → jkatnight joined | 06:19 |
| redbool_ → redbool | 06:20 |
| ← iomari891 left | 06:21 |
| ← taupiqueur2 left | 06:22 |
| ← jkatnight left | 06:23 |
| ← memset left | 06:25 |
| → so-offish joined | 06:28 |
| ← jmd left | 06:28 |
| → ovo joined | 06:32 |
| ovo → Guest4150 | 06:32 |
| → roadie joined | 06:33 |
| → taupiqueur2 joined | 06:36 |
| → otisolsen70 joined | 06:36 |
| → memset joined | 06:37 |
| ← Tobbi left | 06:39 |
| → Tobbi joined | 06:39 |
| ← Guest4150 left | 06:40 |
| ← taupiqueur2 left | 06:41 |
| → ovo_ joined | 06:42 |
| ← gordonfish left | 06:43 |
| → gordonfish joined | 06:44 |
| → crabbedhaloablut joined | 06:45 |
| ← shailangsa left | 06:49 |
| ← memset left | 06:51 |
| → taupiqueur2 joined | 06:53 |
| → so-offishul joined | 06:54 |
| → igemnace joined | 06:54 |
| ← so-offishul left | 06:56 |
| ← dvanloon3 left | 06:57 |
| ← so-offish left | 06:57 |
| ← taupiqueur2 left | 06:57 |
| ← raffaele__ left | 06:58 |
| → raffaele__ joined | 06:58 |
| → dvanloon3 joined | 06:59 |
| → jmd joined | 07:01 |
| ← dvanloon3 left | 07:02 |
| → memset joined | 07:03 |
| ← roadie left | 07:03 |
| → dvanloon3 joined | 07:05 |
| → rama joined | 07:07 |
| → taupiqueur2 joined | 07:09 |
| ← rama left | 07:13 |
| ← taupiqueur2 left | 07:13 |
| → nate2 joined | 07:16 |
| → hwpplayer1 joined | 07:16 |
| ← nate2 left | 07:20 |
| → roadie joined | 07:22 |
| ← hwpplayer1 left | 07:23 |
| ← dvanloon3 left | 07:25 |
| → dvanloon3 joined | 07:26 |
| → hwpplayer1 joined | 07:27 |
| → rhe joined | 07:29 |
| ← hwpplayer1 left | 07:31 |
| ← rhe left | 07:32 |
| ← magic_ninja left | 07:32 |
| → iamsleepy joined | 07:33 |
| → iomari891 joined | 07:33 |
| ← Betal left | 07:34 |
| ← clime left | 07:37 |
| → rhe joined | 07:37 |
| → xFFC joined | 07:39 |
| ← jacobk left | 07:41 |
| → taupiqueur2 joined | 07:44 |
| ← taupiqueur2 left | 07:49 |
| ← qwd left | 07:49 |
| ← APic left | 07:51 |
|
weedmic
| I have setup a git server. I created a few files, added, committed, and pushed them to the server. I see on the server with git-log that the hashes match. everyting is good for me. | 07:51 |
| ← reset left | 07:52 |
| → bgs joined | 07:53 |
|
lericson
| good to hear | 07:56 |
| → warmana joined | 07:58 |
| → taupiqueur2 joined | 08:01 |
| ← dvanloon3 left | 08:02 |
| → dvanloon3 joined | 08:04 |
| ← taupiqueur2 left | 08:06 |
| ← jmd left | 08:06 |
| ← han-solo left | 08:07 |
| → DrowningElysium joined | 08:09 |
| ← perrierjouet left | 08:10 |
| → perrierjouet joined | 08:10 |
| → jklfds_ joined | 08:11 |
|
weedmic
| my first user, who can connect via ssh (tested), does the following command "git clone [email@hidden.address] but is returned "fatal: 'project.git' does not appear to be a git repository - fatal: could not read from remote repository". remot and local both have ...project.git directory and the user is "in" that folder when he executes the clone command and previously "git init" was run in that folder. | 08:13 |
|
| I know the remote reposity is working b/c I can checkout old and new files etc. | 08:14 |
| → han-solo joined | 08:15 |
|
osse
| Is project.git in the git user's home directory on the server | 08:15 |
|
| ? | 08:15 |
| ← dvanloon3 left | 08:19 |
| → dvanloon3 joined | 08:20 |
|
weedmic
| no, it is in /srv/git/project.git | 08:23 |
| → jmd joined | 08:24 |
|
osse
| then you must git [email@hidden.address] | 08:25 |
|
weedmic
| git (user) has only basic tree for new user plus .ssh | 08:25 |
|
| wilco - ty | 08:25 |
| ← haasn left | 08:27 |
| → haasn joined | 08:28 |
| → theoceaniscool joined | 08:28 |
| ← Atque left | 08:33 |
|
weedmic
| worked - appreciated - next phase, get the documents to open in a browser | 08:33 |
| → mobidrop joined | 08:40 |
| ← han-solo left | 08:42 |
| → nyah joined | 08:43 |
|
weedmic
| is there a help page on how to get md (markdown) files to open in a browser. | 08:50 |
| → taupiqueur2 joined | 08:50 |
| ← dvanloon3 left | 08:51 |
| ← gep left | 08:53 |
| → dvanloon3 joined | 08:53 |
|
OMGOMG
| markdown is text, you want to use a text editor. or you need something that converts it to html | 08:56 |
| → TomyWork joined | 08:57 |
| → han-solo joined | 08:58 |
| ← dvanloon3 left | 09:01 |
| → tirnanog joined | 09:01 |
|
wyre
| do I need something special to move a subtree to a folder? or just git mv will do the work? | 09:03 |
| → dvanloon3 joined | 09:06 |
| ← jklfds_ left | 09:06 |
| → gep joined | 09:11 |
| → Lord_of_Life_ joined | 09:12 |
| ← Lord_of_Life left | 09:14 |
| Lord_of_Life_ → Lord_of_Life | 09:15 |
| → hwpplayer1 joined | 09:21 |
| → m1dnight joined | 09:22 |
| ← dvanloon3 left | 09:22 |
| → dvanloon3 joined | 09:25 |
| → moldorcoder7 joined | 09:25 |
| ← memset left | 09:25 |
| → memset joined | 09:26 |
| → jklfds_ joined | 09:26 |
| ← yetoo left | 09:30 |
| ← tirnanog left | 09:31 |
| → tirnanog joined | 09:32 |
| → vysn joined | 09:35 |
| ← jklfds_ left | 09:35 |
| ← gumnos left | 09:38 |
| → gumnos joined | 09:38 |
| ← roadie left | 09:43 |
| ← elichai2 left | 09:45 |
| → elichai2 joined | 09:45 |
| ← memset left | 09:49 |
| → memset joined | 09:49 |
| ← dvanloon3 left | 09:54 |
| ← seds left | 09:54 |
| → seds joined | 09:54 |
|
weedmic
| we discussed it, we're just going to switch over to html. | 09:55 |
| → dvanloon3 joined | 09:56 |
| ← derpydoo left | 09:57 |
| ← YuGiOhJCJ left | 09:58 |
| ← dvanloon3 left | 10:02 |
| → jklfds_ joined | 10:05 |
| → dvanloon3 joined | 10:05 |
| → ceoarrrrrrrrrrrr joined | 10:10 |
| casoalb → abcX | 10:24 |
| ← abcX left | 10:24 |
| → abcX joined | 10:24 |
| ← warmana left | 10:26 |
| ← gep left | 10:28 |
| → warmana joined | 10:28 |
| ← vysn left | 10:31 |
| → vysn joined | 10:33 |
| ← memset left | 10:44 |
| → memset joined | 10:44 |
| ← Masklin left | 10:47 |
| ← JanC left | 10:48 |
|
thebbb
| when "illegal" data was pushed into master, then it was removed by reset --soft old, fixing files, push --force, then how to make sure git repository purged all the old data (gc and all?) | 10:49 |
| → Masklin__Gurder joined | 10:50 |
|
osse
| thebbb: what host? | 10:50 |
| Masklin__Gurder → Masklin | 10:50 |
|
thebbb
| just git gc --prune=all ? | 10:50 |
|
| osse: own server, serving over ssh | 10:51 |
|
| just git gc --prune=all - in all local copies of that repository, and on the server inside the /srv/git/..../ ? | 10:51 |
|
osse
| yeah that should do te trick | 10:52 |
|
| also make sure reflog is disabled (it is by default), or else use git reflog expire --expire=now | 10:52 |
|
thebbb
| ok | 10:52 |
| ← brw left | 10:55 |
| → brw joined | 10:55 |
| ← jklfds_ left | 10:57 |
|
nona
| weedmic: for future reference: pandoc does a really good job at md -> html | 11:01 |
| → JanC joined | 11:01 |
| → jklfds_ joined | 11:03 |
| ← dvanloon3 left | 11:03 |
| ← cafkafk left | 11:04 |
| → dvanloon3 joined | 11:05 |
| ← very_sneaky left | 11:07 |
| → cafkafk joined | 11:08 |
| → Atque joined | 11:08 |
| → very_sneaky joined | 11:09 |
|
weedmic
| ty, i finished and used https://markdowntohtml.com/ (only saw one mistake) | 11:12 |
|
| nona^ | 11:13 |
| ← dvanloon3 left | 11:13 |
| ← aminvakil left | 11:14 |
| → aminvakil joined | 11:14 |
| → dvanloon3 joined | 11:16 |
| ← JanC left | 11:17 |
| → JanC joined | 11:17 |
| → nate2 joined | 11:17 |
|
weedmic
| I have now switched to html. I am trying to make a black rectangluar area with pastings from bash (code box). Here are my style.css and document.html with some explanations. https://pastebin.pl/view/0a87bb86 | 11:19 |
|
| any ideas - links would be great. | 11:20 |
|
| sorry, wrong chat | 11:20 |
| ← lostlazy left | 11:21 |
|
nona
| oh, well, shoulda guessed there's websites for that, too :) | 11:21 |
| → lostlazy joined | 11:21 |
|
nona
| anyways, i like writing docs in markdown and having pandoc somewhere in a Makefile or similar place | 11:21 |
| ← JanC left | 11:22 |
| ← nate2 left | 11:22 |
|
weedmic
| couldnt get it work in markdown AND no one could open the documents in firefox - so we voted to switch to html this morning. | 11:22 |
|
| I did have black with white letters in md though, but not a rectangle | 11:23 |
| → clime joined | 11:23 |
| ← jaeckel left | 11:26 |
| → jaeckel joined | 11:26 |
| ← memset left | 11:26 |
| → JanC joined | 11:28 |
| → memset joined | 11:29 |
| ← taupiqueur2 left | 11:29 |
| ← Atque left | 11:30 |
| ← vysn left | 11:30 |
| → qwd joined | 11:35 |
| → taupiqueur2 joined | 11:42 |
| → APic joined | 11:43 |
| ← taupiqueur2 left | 11:46 |
| → qwd- joined | 11:46 |
| ← qwd left | 11:47 |
| ← APic left | 11:53 |
| → qwd joined | 11:54 |
| ← qwd- left | 11:54 |
| → taupiqueur2 joined | 11:58 |
|
thebbb
| weedmic: for md documentation, people usually just open it in "notepad". but indeed then links, images, would be not working. one could use some convereter locally, so you tell users to git clone / git pull and then some ./generate-docs.sh and then open resulting doc/ in firefox. google "generating html from md" I guess | 11:59 |
| ← taupiqueur2 left | 12:02 |
|
weedmic
| thebbb: your sentence was a bit beyond my english. I have no problem editing md files. we had an issue that they would not open in firefox, so we switched to html which has been completed already. | 12:03 |
| ← dvanloon3 left | 12:03 |
| ← jklfds_ left | 12:03 |
| → dvanloon3 joined | 12:05 |
| → jklfds_ joined | 12:10 |
| ← dvanloon3 left | 12:13 |
| → aspirin joined | 12:14 |
| → dvanloon3 joined | 12:16 |
| ← jklfds_ left | 12:16 |
| → Xaldafax joined | 12:16 |
|
geirha
| Yeah, I don't think any browsers support markdown without installing a plugin for it, so you generally convert it to html for viewing it in a browser | 12:17 |
| → blaklistd8 joined | 12:19 |
| ← blaklistd left | 12:20 |
| blaklistd8 → blaklistd | 12:20 |
| → money joined | 12:21 |
| → APic joined | 12:28 |
| → taupiqueur2 joined | 12:30 |
| → sd5 joined | 12:31 |
| → jklfds_ joined | 12:32 |
| ← taupiqueur2 left | 12:35 |
| → bloody joined | 12:37 |
| Thanzex3268 → Thanzex | 12:38 |
|
weedmic
| i am basically done, but I don't understand why my html document doesn't read the style.css, so I just put the style inside the document. i'm trying to figure it out in the #html kammer. | 12:39 |
| → bf_ joined | 12:40 |
| ← jklfds_ left | 12:45 |
| → __monty__ joined | 12:46 |
| ← astlep5504886 left | 12:47 |
|
__monty__
| I have a string of commits that change a file. Instead of changing that file, I'd like to introduce a copy of the file and then have the commits apply to that copy instead. Can I achieve this with a rename commit and then copying from there to the original name? | 12:48 |
| ← BigShip left | 12:48 |
| → astlep5504886 joined | 12:48 |
| → BigShip joined | 12:48 |
| ← cafkafk left | 12:53 |
| → jklfds_ joined | 12:53 |
| → cafkafk joined | 12:59 |
| → oprypin joined | 13:00 |
| → taupiqueur2 joined | 13:03 |
|
geirha
| I think git filter-branch can do that, but I've never used it myself | 13:03 |
| ← dvanloon3 left | 13:03 |
| → dvanloon3 joined | 13:04 |
|
geirha
| and some quick googling suggests git filter-repo is better | 13:05 |
| ← memset left | 13:05 |
| → memset joined | 13:05 |
| ← taupiqueur2 left | 13:07 |
| → c0dehu1k joined | 13:08 |
| ← dvanloon3 left | 13:09 |
| → dvanloon3 joined | 13:10 |
|
weedmic
| __monty__: why not checkout the version of the file you do not want to put the commits to, change it's name (termporarily), apply the commits to the file you want and then rename it. the rename the temporary file back to it's original name. be aware I'm very new to git. | 13:10 |
| → _sa0sin_ joined | 13:13 |
|
__monty__
| weedmic: I think the later commits will apply to the file before renaming, no? | 13:13 |
| ← dvanloon3 left | 13:13 |
| → vdamewood joined | 13:14 |
| ← sa0 left | 13:14 |
| → dvanloon3 joined | 13:15 |
| → skapata joined | 13:18 |
| → taupiqueur2 joined | 13:20 |
|
weedmic
| don't know enough | 13:20 |
| ← taupiqueur2 left | 13:25 |
| → lgc joined | 13:28 |
| ← lgc left | 13:31 |
| → skeer joined | 13:36 |
| → taupiqueur2 joined | 13:37 |
| ← dvanloon3 left | 13:40 |
| ← taupiqueur2 left | 13:42 |
| → vhs joined | 13:42 |
| ← ketas left | 13:44 |
| → countach202020 joined | 13:45 |
| ← memset left | 13:45 |
| → memset joined | 13:46 |
| → ferdna joined | 13:49 |
| ← Xenguy left | 13:54 |
| → taupiqueur2 joined | 13:54 |
| ← skapata left | 13:55 |
|
ross
| __monty__: have you considered 1. move the file with the changes to a new location 2. checkout the old version of the file without changes | 13:55 |
| ← weedmic left | 13:56 |
|
ross
| `mv file.txt file-new.txt`, `git checkout OLD_COMMIT_REF -- file.txt` | 13:56 |
| ← chexum left | 13:56 |
| → stengah joined | 13:57 |
| → chexum joined | 13:57 |
|
ross
| the history would not be as clean as you initially wanted (i.e. "I copied this file then changed the copy"), it would be "I changed this file then added a new file that's identical to what that file was before", but the end result is the same | 13:58 |
| ← taupiqueur2 left | 13:58 |
| → f_ joined | 13:59 |
|
__monty__
| That's what I have now. But I'd like a cleaner history for review. | 14:01 |
| → causa_sui joined | 14:04 |
| ← vhs left | 14:04 |
|
__monty__
| I was just hoping I could avoid manually rewriting the history so that later cherry-picks wouldn't break. | 14:04 |
| → vhs joined | 14:05 |
| ← vhs left | 14:05 |
| ← jim left | 14:05 |
| → jim joined | 14:05 |
|
ross
| if you wanted to rewrite the history of what happened to that file and its copy, you would have to rewrite history | 14:05 |
|
__monty__
| Maybe filter-repo can help doing this but I'm not sure I can figure it out. | 14:06 |
|
| Yes, but if I add a rename commit and then base everything on that. Then splice in a commit so the rename was just a copy. I *think* I would get close to what I'm after? | 14:06 |
| ← dviola left | 14:07 |
|
ross
| if that works (which it might! I have no idea), you would still be rewriting history if that's something you were looking to avoid | 14:07 |
|
| roughly how many commits are we talking about? | 14:08 |
| ← wgrant left | 14:09 |
|
__monty__
| No, I definitely need to rewrite the history. I'm just hoping there's a way to do it that won't make further cherry-picks horribly confusing. | 14:09 |
|
ross
| if we're talking like, 3, you could checkout the repo before any changes to that file and then `git checkout REF -- file.txt > file.txt && git commit` for each REF in the list of commits | 14:09 |
|
| sorry - `git checkout REF -- file.txt > file-copy.txt && git commit` | 14:10 |
|
| you could maybe even do `git rebease --interactive` and add an `exec` step between each step that does something like that | 14:11 |
| → taupiqueur2 joined | 14:11 |
|
ross
| I would class that as horribly confusing, though - why is it important that you have a 'clean history' here? | 14:11 |
|
__monty__
| It's about 120 commits. | 14:12 |
| → squirrel joined | 14:13 |
|
__monty__
| It's a large change so I want to split it up to make it reviewable. But we can't very well merge partial changes because that leaves a non-functional state. | 14:13 |
|
| So I want to transform changes to files into basically developing a sub-hierarchy alongside that we can then swap for the originals at the very end. | 14:14 |
|
ross
| ah ok! so the end goal is to have just a single file with all of the changes, but in the meantime, you want to show your review versions of that file from various points in the development process? | 14:14 |
|
| s/review/reviewer | 14:15 |
| ← taupiqueur2 left | 14:15 |
|
__monty__
| Yes, though this is about files strewn around a directory structure. And there'll probably be many reviewers involved. | 14:16 |
| ← Kays left | 14:18 |
| → Kays joined | 14:18 |
| ← memset left | 14:19 |
| → memset joined | 14:19 |
| ← jklfds_ left | 14:19 |
| → hbautista joined | 14:22 |
| → wgrant joined | 14:22 |
| ← stengah left | 14:24 |
| ← bloody left | 14:25 |
| → liefer396 joined | 14:26 |
| ← filePeter left | 14:27 |
| → Atque joined | 14:28 |
| ← money left | 14:29 |
| → thiago joined | 14:30 |
| → magic_ninja joined | 14:33 |
| → stengah joined | 14:34 |
| → Rashad joined | 14:36 |
| ← hwpplayer1 left | 14:38 |
| → Gary_Sinise joined | 14:39 |
|
ross
| __monty__: instead of polluting the branch's history with copies of files, I would share with reviewers a list of references to those files at those points in history | 14:39 |
|
| you mention wanting to keep a clean history but this feels like intentionally dirtying your history | 14:40 |
| ← Arsen left | 14:40 |
| ← phogg left | 14:40 |
|
__monty__
| The problem is that these things need to get merged one-by-one. | 14:40 |
| → Arsen joined | 14:40 |
| → phogg joined | 14:41 |
| ← thiago left | 14:41 |
| → rama joined | 14:41 |
|
__monty__
| And that can't be done while they touch the original files. But they *can* be useful if they live alongside. | 14:41 |
| ← rama left | 14:42 |
|
ross
| then create branches at various points along the history (e.g. branch1 at 10 commits in, branch2 at 20 commits in, etc) and create a pull request for each one | 14:42 |
| → rama joined | 14:42 |
|
__monty__
| And how would they be merged without putting the repo in a broken state? | 14:43 |
|
| Well, the code, not the actual git repo. | 14:44 |
|
ross
| you just said you need to merge these partial file changes one by one, no? | 14:44 |
| ← stengah left | 14:44 |
|
__monty__
| Yes, to make them reviewable. But the partial changes can't be done to the original files. Those need to remain unaltered until everything's in place to be switched out. | 14:45 |
| ← memset left | 14:45 |
| → taupiqueur2 joined | 14:45 |
| → memset joined | 14:46 |
|
ross
| ok, then merge these partial changes one-by-one into a staging branch, and then when all the reviews are cleared, merge that into the main branch | 14:46 |
|
__monty__
| Unfortunately, I don't see that workflow working in this case. And like I said. The copies won't just be inert copies hanging out in the repo. They'd be immediately usable. | 14:49 |
| ← ProperNoun left | 14:49 |
|
ross
| why doesn't that workflow work in this case? | 14:49 |
|
| if the copies are immediately usable, why does merging them result in a broken codebase? | 14:49 |
| → ProperNoun joined | 14:49 |
| ← taupiqueur2 left | 14:50 |
|
__monty__
| They're usable alongside the originals. Not replacing them because there's a whole hierarchy of dependencies. | 14:50 |
|
| And a separate branch doesn't work because that'll leave a similar amount of integration work when it finally does become time to switch over. Resulting in another huge review. | 14:51 |
|
ross
| so you are creating copies of this file as a sort of version control system for that file? | 14:51 |
| → dviola joined | 14:52 |
|
ross
| you would not have to review the entirety of the staging branch merge because each part of it would already have been reviewed | 14:52 |
| ← Night0wl left | 14:53 |
|
__monty__
| No, it's a package, with lots of dependencies. I'm working to change that package. But it requires a ton of changes throughout the tree. However, if introduced alongside it'd be immediately usable. (Mostly in a technical sense, I'm not sure anyone would want to.) | 14:53 |
| → Night0wl joined | 14:53 |
| → zen_coder joined | 14:56 |
|
ross
| I'm terribly sorry, it seems that I don't really understand what you're looking to achieve, and I'm not sure that I'm going to be able to | 14:57 |
|
| but I wish you the best of luck with it regardless | 14:57 |
| ← mobidrop left | 14:57 |
| → node1 joined | 14:57 |
| → gh34 joined | 14:58 |
|
__monty__
| Np, thank you for trying. I might be misguided but I've been thinking about this for a while and I haven't managed to figure out a better way. That's why I figured I'd ask, maybe someone sees right through the nonsense and can tell me how I'm missing something obvious. | 15:01 |
| ← raffaele__ left | 15:03 |
| → raffaele__ joined | 15:03 |
|
selckin
| you've only described your solution, not what the problem is | 15:04 |
|
__monty__
| My last comment but one describes the problem as succinctly as I can. | 15:05 |
|
selckin
| not really | 15:06 |
| ← elastic_dog left | 15:06 |
|
node1
| Can anyone suggest tools and methods for structuring and plotting building projects, similar to the diagrams used in AWS infrastructure documentation? | 15:08 |
|
__monty__
| Not sure I should bother people with the specifics. It's about stdenv changes in Nixpkgs. | 15:09 |
|
node1
| Constructing a project roadmap including git management also incorporating costs and other pertinent aspects? | 15:11 |
|
selckin
| draw.io | 15:12 |
| ← ferdna left | 15:13 |
| ← theoceaniscool left | 15:15 |
|
node1
| Specifically, I'm looking for a method that encompasses creating a project roadmap, integrating Git management, and incorporating costs and other relevant factors. | 15:16 |
| → skapata joined | 15:18 |
| → nate2 joined | 15:19 |
| → elastic_dog joined | 15:19 |
| ← c0dehu1k left | 15:20 |
| → stengah joined | 15:20 |
| → taupiqueur2 joined | 15:21 |
| ← nate2 left | 15:23 |
| ← Muzer left | 15:23 |
| ← taupiqueur2 left | 15:25 |
| → thiago joined | 15:34 |
| ← countach202020 left | 15:34 |
| ← stengah left | 15:35 |
| → Muzer joined | 15:35 |
| ← DrowningElysium left | 15:39 |
| → taupiqueur2 joined | 15:39 |
| ← thiago left | 15:42 |
| ← taupiqueur2 left | 15:43 |
| → thiago joined | 15:44 |
| → hwpplayer1 joined | 15:48 |
| → bipul_ joined | 15:52 |
| ← bipul_ left | 15:53 |
| ← node1 left | 15:54 |
| ← bf_ left | 15:54 |
| → taupiqueur2 joined | 15:56 |
| ← Atque left | 15:57 |
| → cdown joined | 16:00 |
| ← taupiqueur2 left | 16:01 |
| → Wuzzy joined | 16:01 |
| ← gvg left | 16:04 |
| → jklfds_ joined | 16:04 |
| → gvg joined | 16:06 |
| ← cambrian_invader left | 16:07 |
| ← rfuentess left | 16:07 |
| → falafel joined | 16:07 |
| ← ovo_ left | 16:07 |
| → cambrian_invader joined | 16:07 |
| → ovo joined | 16:08 |
| ovo → Guest6032 | 16:08 |
| ← gloomy left | 16:11 |
| ← moldorcoder7 left | 16:11 |
| → m0viefreak joined | 16:12 |
| → filePeter joined | 16:13 |
| ← jklfds_ left | 16:13 |
| → c0dehu1k joined | 16:14 |
| → codaraxis joined | 16:15 |
| ← xFFC left | 16:19 |
| → roadie joined | 16:19 |
| ← de-vri-es left | 16:20 |
| → de-vri-es joined | 16:21 |
| → jacobk joined | 16:22 |
| → bywaterloo joined | 16:24 |
| → jklfds_ joined | 16:25 |
| → bywaterloo_ joined | 16:25 |
| ← c0dehu1k left | 16:25 |
| ← hwpplayer1 left | 16:26 |
| ← bywaterloo left | 16:28 |
| ← jklfds_ left | 16:29 |
| → terminalpusher joined | 16:29 |
| ← zen_coder left | 16:30 |
| → taupiqueur2 joined | 16:31 |
| ← taupiqueur2 left | 16:35 |
| ← coot left | 16:38 |
| ← very_sneaky left | 16:43 |
| → duxsco joined | 16:44 |
| ← Erisa left | 16:46 |
| → Erisa joined | 16:46 |
| → jklfds_ joined | 16:50 |
| ← igemnace left | 16:50 |
| ← warmana left | 16:53 |
| ← jklfds_ left | 16:55 |
| ← filePeter left | 16:58 |
| ← earthbreaker left | 16:59 |
| → earthbreaker joined | 16:59 |
| ← Rashad left | 17:00 |
| → very_sneaky joined | 17:06 |
| → jklfds_ joined | 17:07 |
| → bret joined | 17:08 |
| ← rama left | 17:09 |
| → rama joined | 17:10 |
| ← jklfds_ left | 17:12 |
| → gast0n joined | 17:16 |
| ← ryjen left | 17:16 |
| → ryjen joined | 17:16 |
| → jklfds_ joined | 17:25 |
| ← duxsco left | 17:25 |
| → coot joined | 17:27 |
| ← keypusher left | 17:28 |
| → keypusher joined | 17:28 |
| ← dogui left | 17:34 |
| ← rama left | 17:39 |
| → rama joined | 17:40 |
| → nvmd joined | 17:40 |
| ← JanC left | 17:43 |
| ← iomari891 left | 17:45 |
| → taupiqueur2 joined | 17:46 |
| → taupiqueur3 joined | 17:48 |
| → iomari891 joined | 17:49 |
| ← taupiqueur2 left | 17:50 |
| ← memset left | 17:53 |
| ← coot left | 17:54 |
| ← taupiqueur3 left | 17:55 |
| → taupiqueur3 joined | 17:56 |
| ← jacobk left | 18:00 |
| → alexherbo2 joined | 18:01 |
| ← daddy left | 18:03 |
| → daddy joined | 18:04 |
| → gas51627 joined | 18:05 |
| → JanC joined | 18:05 |
| → memset joined | 18:05 |
| ← falafel left | 18:11 |
| ← jmd left | 18:13 |
| → kkawg joined | 18:14 |
| → Inline joined | 18:14 |
| ← han-solo left | 18:15 |
| → peas joined | 18:24 |
| → bywaterloo joined | 18:28 |
| → gareppa joined | 18:30 |
| ← bywaterloo_ left | 18:30 |
| ← __monty__ left | 18:32 |
| ← gareppa left | 18:32 |
| ← alexherbo2 left | 18:33 |
| → gareppa joined | 18:34 |
| ← gareppa left | 18:37 |
| → reset joined | 18:41 |
| → gareppa joined | 18:41 |
| → Kremator joined | 18:46 |
| → jmd joined | 18:52 |
| ← TomyWork left | 18:54 |
| ← hbautista left | 18:59 |
| → dlb76 joined | 19:01 |
| ← YoungFrog left | 19:04 |
| → YoungFrog joined | 19:04 |
| ← mexen left | 19:09 |
| → bambanxx joined | 19:12 |
| ← dlb76 left | 19:12 |
| → hwpplayer1 joined | 19:13 |
| ← Argorok left | 19:18 |
| ← iamsleepy left | 19:19 |
| → nate2 joined | 19:20 |
| ← sd5 left | 19:21 |
| ← piwu1 left | 19:22 |
| ← nate2 left | 19:25 |
| → zen_coder joined | 19:29 |
| → dlb76 joined | 19:29 |
| → piwu1 joined | 19:34 |
| ← jklfds_ left | 19:34 |
| → jklfds_ joined | 19:35 |
| ← CalimeroTeknik left | 19:49 |
| → CalimeroTeknik joined | 19:49 |
| ← terminalpusher left | 19:50 |
| → terminalpusher joined | 19:51 |
| ← f_ left | 19:51 |
| JanC → Guest9671 | 19:55 |
| → JanC joined | 19:55 |
| ← Guest9671 left | 19:56 |
| ← EvgenyK left | 19:57 |
| → EvgenyK joined | 19:58 |
| ← memset left | 20:00 |
| ← mkoskar left | 20:00 |
| ← iomari891 left | 20:01 |
| ← dostoyevsky2 left | 20:01 |
| → dostoyevsky2 joined | 20:01 |
| → mkoskar joined | 20:01 |
| → memset joined | 20:01 |
| ← Wuzzy left | 20:03 |
| ← jklfds_ left | 20:09 |
| → jklfds_ joined | 20:11 |
| ← terminalpusher left | 20:13 |
| ← jklfds_ left | 20:17 |
| → vhs joined | 20:18 |
| ← vhs left | 20:19 |
| ← memset left | 20:27 |
| ← vdamewood left | 20:29 |
| → jklfds_ joined | 20:30 |
| ← kkawg left | 20:30 |
| ← jklfds_ left | 20:34 |
| → duxsco joined | 20:38 |
| → jklfds_ joined | 20:39 |
| ← jrm left | 20:40 |
| → jrm joined | 20:41 |
| ← rama left | 20:43 |
| ← jklfds_ left | 20:43 |
| → rama joined | 20:43 |
| → jkatnight joined | 20:47 |
| ← njt left | 20:51 |
| ← gareppa left | 20:54 |
| ← gh34 left | 20:55 |
| → jklfds_ joined | 20:56 |
| ← jmd left | 20:56 |
| ← hwpplayer1 left | 20:57 |
| → gareppa joined | 20:57 |
| → memset joined | 20:58 |
| → codaraxis__ joined | 21:00 |
| → vysn joined | 21:00 |
| ← zen_coder left | 21:02 |
| → blaklistd9 joined | 21:03 |
| ← codaraxis left | 21:03 |
| ← jklfds_ left | 21:05 |
| ← blaklistd left | 21:05 |
| blaklistd9 → blaklistd | 21:05 |
| ← aspirin left | 21:05 |
| ← jkatnight left | 21:07 |
| → hbautista joined | 21:08 |
| → jkatnight joined | 21:08 |
| → coot joined | 21:09 |
| → jklfds_ joined | 21:09 |
| ← raffaele__ left | 21:09 |
| → so-offish joined | 21:09 |
| → raffaele__ joined | 21:10 |
| ← keypusher left | 21:10 |
| → keypusher joined | 21:12 |
| ← rama left | 21:12 |
| ← BukkitGerman left | 21:14 |
| ← jklfds_ left | 21:14 |
| → BukkitGerman joined | 21:14 |
| ← farn left | 21:15 |
| → farn joined | 21:17 |
| ← roadie left | 21:19 |
| → jklfds_ joined | 21:20 |
| ← clime left | 21:20 |
| ← gareppa left | 21:25 |
| ← chupacabra left | 21:27 |
| → chupacabra joined | 21:28 |
| ← jklfds_ left | 21:28 |
| ← coot left | 21:29 |
| → coot joined | 21:29 |
| ← jkatnight left | 21:29 |
| → EvgenyK_ joined | 21:30 |
| → jklfds_ joined | 21:31 |
| ← EvgenyK left | 21:33 |
| → iomari891 joined | 21:33 |
| → KnoP joined | 21:34 |
| ← jklfds_ left | 21:35 |
| → njt joined | 21:37 |
| → rama joined | 21:39 |
| ← Inline left | 21:39 |
| ← feriman left | 21:41 |
| ← rama left | 21:46 |
| ← otisolsen70 left | 21:46 |
| ← bambanxx left | 21:48 |
| ← Traneptora left | 21:51 |
| → bambanxx joined | 21:52 |
| ← coot left | 21:57 |
| ztrawhcse → yourself | 21:59 |
| yourself → ztrawhcse | 22:00 |
| ← Kremator left | 22:02 |
| → jklfds_ joined | 22:02 |
| → Traneptora joined | 22:05 |
| ← chexum left | 22:07 |
| ← jklfds_ left | 22:07 |
| → chexum joined | 22:08 |
| ← KnoP left | 22:08 |
| ← EvgenyK_ left | 22:09 |
| → rama joined | 22:09 |
| → KnoP joined | 22:10 |
| → bish0p_dl joined | 22:12 |
| ← KnoP left | 22:12 |
| → EvgenyK_ joined | 22:12 |
| ← rama left | 22:14 |
| → rama joined | 22:16 |
| → roadie joined | 22:17 |
| → jklfds_ joined | 22:19 |
| ← taupiqueur3 left | 22:19 |
| ← duxsco left | 22:20 |
| ← gildasio left | 22:20 |
| ← m0viefreak left | 22:21 |
| ← roadie left | 22:24 |
| ← BrianBlaze left | 22:25 |
| ← jklfds_ left | 22:26 |
| → skapate joined | 22:27 |
| ← skapata left | 22:27 |
| → BrianBlaze joined | 22:30 |
| ← causa_sui left | 22:33 |
| → ketas joined | 22:39 |
| ← bgs left | 22:42 |
| → lucasta joined | 22:42 |
| → jkatnight joined | 22:42 |
| ← lucasta left | 22:43 |
| → taupiqueur3 joined | 22:48 |
| ← thiago left | 22:49 |
| → roadie joined | 22:51 |
| ← dviola left | 22:52 |
| ← jkatnight left | 22:52 |
| → dviola joined | 22:53 |
| → jklfds_ joined | 22:53 |
| ← taupiqueur3 left | 22:53 |
| ← tomhg left | 22:55 |
| ← jklfds_ left | 22:58 |
| ← roadie left | 23:00 |
| ← bywaterloo left | 23:07 |
| → jklfds_ joined | 23:09 |
| ← bish0p_dl left | 23:10 |
| → tomhg joined | 23:12 |
| ← jklfds_ left | 23:14 |
| ← tirnanog left | 23:16 |
| ← nyah left | 23:16 |
| → jkatnight joined | 23:19 |
| → farzat joined | 23:20 |
| → jklfds_ joined | 23:21 |
| → nate2 joined | 23:22 |
| ← jklfds_ left | 23:25 |
| ← nate2 left | 23:26 |
| ← jakesyl____ left | 23:27 |
| → roadie joined | 23:27 |
| → jakesyl____ joined | 23:28 |
| ← tomhg left | 23:34 |
| ← roadie left | 23:36 |
| ← ProperNoun left | 23:37 |
| → karabaja4 joined | 23:38 |
| → jklfds_ joined | 23:39 |
| → Atque joined | 23:42 |
| ← jklfds_ left | 23:46 |
| ← brw left | 23:49 |
| → brw joined | 23:50 |
| ← jkatnight left | 23:51 |
| → jkatnight joined | 23:53 |
| ← very_sneaky left | 23:53 |
| → very_sneaky joined | 23:54 |
| → odoood joined | 23:57 |
| ← jkatnight left | 23:58 |
| → taupiqueur3 joined | 23:59 |