tuxd3v | Does any one here, verify kernels signatures, against autosigner + kernel Developers from Mainline repo? | 03:57 |
---|---|---|
tuxd3v | I am receiving this output when I try to fecth the keys.. | 03:57 |
tuxd3v | https://paste.debian.net/hidden/66607756/ | 03:58 |
tuxd3v | gpg: WARNING: unacceptable HTTP redirect from server was cleaned up | 03:58 |
tuxd3v | the signatures all mach and the checksum too | 04:00 |
tuxd3v | but I don't know why this redirect.. | 04:00 |
rrq | note: alpha version(s) of chimaera netinstall installer-iso is set up to be published on Mondays at files.devuan.org | 04:25 |
rrq | only amd64 atm | 04:25 |
fsmithred | I'm confused about who owns my projects. I thought I tranferred clearlooks-phenix-deepsea-theme and deepsea-icon-theme to devuan, but they don't come up when I search for them on the dashboard. | 12:59 |
fsmithred | If I replace my name in the url with 'devuan' I can find the icon theme, but I get a 404 on the desktop theme. Both projects still appear in my profile as personal projects. Both have been built and have packages in the repo. What's going on? | 13:01 |
fsmithred | I'd like to remove them from my personal projects, but I want to make sure they exist as devuan projects before I do that. | 13:02 |
rrq | mmm devuan/clearlooks-phenix-deepsea-theme says it's a fork of fsmithred/... not sure what that means | 13:05 |
fsmithred | I guess I can just go ahead and delete them. If it deletes the devuan project, I can re-create it and push. | 13:05 |
rrq | devuan/deepsea-icon-theme is "normal" (not saying it's a fork) | 13:06 |
fsmithred | I don't recall what I did differently. | 13:06 |
rrq | go ahead | 13:06 |
rrq | I think the better way would be if the personal is a fork of devuan's ... that would make more sence for merging | 13:07 |
rrq | not sure it makes a practical difference though | 13:08 |
fsmithred | ok, I deleted deepsea-icon-theme and now I can't find it on dashboard | 13:08 |
rrq | I added "packages" team to it ... try agai? | 13:09 |
fsmithred | clearlooks-phenix-deepsea comes up but not the icon theme | 13:10 |
rrq | too fast :) I just added "packages" to its collaborators as well | 13:11 |
rrq | maybe they need "editors" access as well? | 13:11 |
fsmithred | and it now shows up | 13:11 |
fsmithred | thinking... | 13:12 |
fsmithred | not awake enough yet to answer that | 13:12 |
rrq | ... technically you have admin powers; when the synapses shake | 13:13 |
fsmithred | maybe not. I finally figured out the right way to do it. | 13:13 |
fsmithred | how to make a patch to apply all the changes. | 13:13 |
fsmithred | I have the plain clearlooks-phenix theme as a personal repo. That's just what we forked. And that's why you saw it was a fork. | 13:17 |
fsmithred | deepsea a fork, I mean | 13:17 |
rrq | yes, I don't mind ... just that the notion "A is fork of B" to me suggests that B is a "master" into which changes to A are merged. | 13:21 |
rrq | but I can handle the "dissonance" :) | 13:22 |
fsmithred | which one is listed as a fork? | 13:22 |
rrq | devuan/clearlooks-phenix-deepsea-theme is said to be a fork from fsmithred/clearlooks-phenix-theme | 13:23 |
rrq | on the gui | 13:23 |
fsmithred | the fork is the one that is changed and different from the original/source | 13:23 |
fsmithred | isn't that correct? | 13:23 |
rrq | mmm probably there are two competing uses of "fork" ... | 13:24 |
rrq | the other is that the "main project" are forked by various developers who then issue "pull requests" for merging in their updates | 13:25 |
fsmithred | the personal theme is not mine. I just copied it. | 13:25 |
rrq | maybe there are left-handed and right-handed forks :) | 13:26 |
fsmithred | lol | 13:26 |
fsmithred | how do we do it for the packages we sanitize from debian? | 13:27 |
onefang | Don't forget sporks. | 13:27 |
rrq | :) | 13:27 |
fsmithred | and how can I clone a repo from salsa.debian.org? | 13:28 |
fsmithred | will they let me create an account there? | 13:28 |
rrq | don;t need an account; just use the https access. I usually set it up as a "secondary" remote | 13:30 |
rrq | to pull from | 13:30 |
fsmithred | I thought I got asked for a login with that, but maybe I just tried the ssh | 13:30 |
rrq | if the source is public it shouldn't need login for https access | 13:31 |
fsmithred | ok | 13:31 |
fsmithred | can a secondary remote be applied only to one branch? | 13:31 |
rrq | git remote add debian https://salsa.debian.org/jadajadajada | 13:32 |
fsmithred | for the desktop theme, there's a debian-master branch that I don't change | 13:32 |
rrq | then: git pull debian | 13:32 |
rrq | gives you a branch named "debian/master" | 13:33 |
rrq | as opposed to the previous "origin/master" | 13:33 |
fsmithred | I can try that with the clearlooks-phenix theme | 13:33 |
rrq | also useful: git log --oneline --all --graph | 13:37 |
fsmithred | oh, I already have a debian/master branch, and it's the only branch. | 13:37 |
rrq | right; is that attached to salsa? | 13:38 |
fsmithred | no, it shows my repo as origin | 13:38 |
fsmithred | even after adding debian | 13:38 |
rrq | ah, there is a branch "origin/debian/master" | 13:39 |
fsmithred | can I do a set-url on just the fetch? | 13:39 |
rrq | no I think you need to separate it into 2 remotes | 13:39 |
fsmithred | where do you see origin/debian/master? | 13:40 |
rrq | git branch -r | 13:40 |
fsmithred | so checkout -b master? | 13:40 |
fsmithred | or some other name? | 13:40 |
rrq | well git is a bit funny in applying defaults when possible | 13:41 |
fsmithred | origin/HEAD -> origin/debian/master | 13:41 |
fsmithred | origin/debian/master | 13:41 |
fsmithred | origin/pristine-tar | 13:41 |
fsmithred | origin/upstream/latest | 13:41 |
rrq | git checkout debian/master | 13:41 |
rrq | will focus the workspace on origin/debian/master | 13:42 |
fsmithred | 'already on... | 13:42 |
rrq | but you need a second remote .. maybe name it "salsa" then, to avoid confusion | 13:42 |
fsmithred | which one would be the one I would alter if I wanted to do that? | 13:43 |
rrq | you need to think in terms of two separate remote stores; the first one called "origin" and the second called "salsa" | 13:44 |
rrq | each of them have branches | 13:45 |
fsmithred | I'm stuck on thinking that one branch is identical to what debian has and one is a branch that I can mess with and change | 13:45 |
fsmithred | but both of the names belong to debian | 13:45 |
fsmithred | that's what is confusing me | 13:45 |
fsmithred | where's my branch? | 13:46 |
rrq | probably the commits on "origin/debian/master" will coinside with (some) commits of "salsa/master" | 13:46 |
fsmithred | I havfe made no commits | 13:46 |
fsmithred | other than to put the repo there | 13:46 |
rrq | yes.. when you copied that first time you got those commits .. maybe you should have used the dual remote notion already then | 13:48 |
fsmithred | yeah, it would be nice to be able to pull any new changes from debian | 13:48 |
fsmithred | ...just in case he ever notices my bug report. | 13:50 |
rrq | one option could be to hand-edit the config to "move" the origin remote into a "salsa" remote and link it up with salsa ... a bit complex though | 13:50 |
rrq | the easiest is to rather create that second remote and pull; I think git will discover equivalences | 13:51 |
rrq | (or maybe not) | 13:51 |
rrq | then you can delete any unused/unchanged origin branches so that the origin is focussed on suites/unstable | 13:52 |
rrq | if git doesn't discover equivalences you may need to merge into suites/unstable appropriately | 13:54 |
rrq | by hand | 13:54 |
fsmithred | You asked to pull from the remote 'salsa', but did not specify | 13:56 |
fsmithred | a branch. Because this is not the default configured remote | 13:56 |
fsmithred | for your current branch, you must specify a branch on the command line. | 13:56 |
rrq | right; how about: git fetch --all | 13:56 |
fsmithred | why can't I just use debian/master? | 13:56 |
fsmithred | for pulling from debin | 13:57 |
fsmithred | Fetching origin | 13:58 |
fsmithred | Fetching debian | 13:58 |
fsmithred | warning: redirecting to https://salsa.debian.org/desktop-themes-team/clearlooks-phenix-theme.git/ | 13:58 |
fsmithred | From https://salsa.debian.org/desktop-themes-team/clearlooks-phenix-theme | 13:58 |
fsmithred | * [new branch] debian/master -> debian/debian/master | 13:58 |
fsmithred | * [new branch] pristine-tar -> debian/pristine-tar | 13:58 |
fsmithred | * [new branch] upstream/latest -> debian/upstream/latest | 13:58 |
fsmithred | Fetching salsa | 13:58 |
fsmithred | ' | 13:58 |
rrq | that looks good | 13:58 |
fsmithred | I'm lost | 13:59 |
rrq | use: git log --oneline --all --graph | 13:59 |
fsmithred | is debian/master the same as debian/master? | 13:59 |
fsmithred | or are they different? | 13:59 |
rrq | check with: git log --oneline --all --graph | 14:00 |
fsmithred | yeah, I'm looking at that | 14:00 |
rrq | it'll tell where in the total workspace history those branch heads are | 14:00 |
rrq | it's origin/debian/master vs salsa/debian/master | 14:01 |
rrq | the origin one should be on the trail of the salsa one | 14:01 |
rrq | unless you have changed it (the origin one) | 14:02 |
rrq | commit af1fc20 is head of origin/debian/master) | 14:03 |
fsmithred | what does that mean? | 14:03 |
rrq | "commit af1fc20" is that particular version in the history, and that is where the branch origin/debian/master is (or was when I cloned some moments ago) | 14:05 |
fsmithred | ok, so I know where it is | 14:05 |
rrq | ideally that commit is also in the history of the salsa/debian/master branch | 14:05 |
fsmithred | but I dont' know what it is | 14:05 |
fsmithred | there's a debian/master on salsa and a debian/master on gdo. Can they be identical? | 14:06 |
fsmithred | is that a foolish request>? | 14:06 |
rrq | I hoped that origin/debian/master (on gdo) corrspnds to the tail of salsa/debian/master | 14:07 |
rrq | i.e. the origin one was cloned from the salsa one some time ago | 14:07 |
rrq | but salsa may have had changes | 14:08 |
fsmithred | lol | 14:08 |
rrq | whils origin shouldn't | 14:08 |
fsmithred | I don't think so | 14:08 |
fsmithred | yeah, but why can't I just set origin to pull from salsa and get updated with any changes? | 14:08 |
rrq | with "git log .." what's the commit labelled salsa/debian/master | 14:09 |
fsmithred | then I won't get messages from git about having a different name | 14:09 |
fsmithred | commit af1fc20fb51896041c182528f2d9acad680a8da1 (HEAD -> salsa, salsa/debian/master, origin/debian/master, origin/HEAD, debian/debian/master, debian/master) | 14:09 |
rrq | right; good; so that's the same commit af1fc20.... | 14:10 |
rrq | so now you can delete the origin/debian/master branch | 14:10 |
rrq | that does not delete those commits | 14:10 |
rrq | it deletes "the branch pointer" | 14:11 |
rrq | make it no longer existent | 14:11 |
fsmithred | and then I'll only have a salsa branch? | 14:11 |
rrq | yes | 14:11 |
fsmithred | why do I want that? | 14:11 |
rrq | and only a fond, personal memory of the origin/debian/master branch | 14:12 |
rrq | it doesn't need any such branch pointer in origin | 14:12 |
rrq | because you wouldn't want origin changes to it separate from salsa's changes | 14:13 |
rrq | less confusion | 14:13 |
rrq | (if that's possible with git) | 14:13 |
fsmithred | is there an advantage to having different names between what's on salsa.debian.org and what's on git.devuan.org? | 14:15 |
rrq | mmm only if you want to track branch changes in that way | 14:17 |
fsmithred | to me it makes sense that whatever I have that tracks the repo on salsa.debian.org should have the same name | 14:17 |
fsmithred | I can remeber that debian/master branch is the same as debian/master | 14:18 |
rrq | mm isn't it a matter of keeping the tung in the right mouth? | 14:19 |
fsmithred | ? | 14:19 |
rrq | note that a branch "origin/debian/master" is a pointer into the pool of commits, and so is "salsa/debian/master" | 14:19 |
rrq | if the remote salsa changes its "salsa/debian/master" then they two will point at different commits | 14:20 |
rrq | and the gdo maintainer would need to update so as to move origin/debian/master accordingly | 14:21 |
rrq | basically I would delete origin/debian/master | 14:22 |
rrq | and only keep "salsa/debian/master" since that's the "owner" of that branch | 14:22 |
rrq | likewise for the other "duplicated" branch names | 14:23 |
rrq | leaving only suites/unstable as special for origin | 14:23 |
fsmithred | there's no suites/unstable | 14:24 |
rrq | there's an origin/suites/unstable isn't there? | 14:24 |
fsmithred | $ git branch | 14:25 |
fsmithred | debian/master | 14:25 |
fsmithred | * salsa | 14:25 |
rrq | git branch -r | 14:25 |
rrq | (it's not your current branch) | 14:25 |
fsmithred | debian/debian/master | 14:25 |
fsmithred | debian/pristine-tar | 14:25 |
fsmithred | debian/upstream/latest | 14:25 |
fsmithred | origin/HEAD -> origin/debian/master | 14:25 |
fsmithred | origin/debian/master | 14:25 |
fsmithred | origin/pristine-tar | 14:25 |
fsmithred | origin/upstream/latest | 14:25 |
fsmithred | salsa/debian/master | 14:25 |
fsmithred | salsa/pristine-tar | 14:25 |
fsmithred | salsa/upstream/latest | 14:25 |
rrq | nice :) lots of confusion to welter in | 14:26 |
fsmithred | I thought we were in pm | 14:27 |
rrq | thus, there are 3 remotes: debina, origin and salsa | 14:27 |
fsmithred | so what do I need to do? | 14:29 |
Generated by irclog2html.py 2.17.0 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!