ChanServ changed the topic of #freedesktop to: https://www.freedesktop.org infrastructure and online services || for questions about freedesktop.org projects, please see each project's contact || for discussions about specifications, please use https://gitlab.freedesktop.org/xdg or xdg@lists.freedesktop.org
karenw has joined #freedesktop
Haaninjo has quit [Quit: Ex-Chat]
alpernebbi has quit [Ping timeout: 480 seconds]
karenw has quit [Ping timeout: 480 seconds]
alpernebbi has joined #freedesktop
scrumplex has joined #freedesktop
scrumplex_ has quit [Ping timeout: 480 seconds]
svuorela has quit [Ping timeout: 480 seconds]
svuorela has joined #freedesktop
ximion has quit [Remote host closed the connection]
mrpops2ko has quit []
mrpops2ko has joined #freedesktop
swatish2 has joined #freedesktop
psykose has quit [Remote host closed the connection]
psykose has joined #freedesktop
lsd|2 has joined #freedesktop
JanC has quit [Ping timeout: 480 seconds]
strugee_ has joined #freedesktop
strugee has quit [Ping timeout: 480 seconds]
strugee_ is now known as strugee
lsd|2 has quit [Ping timeout: 480 seconds]
abhimanyu has joined #freedesktop
sima has joined #freedesktop
tzimmermann has joined #freedesktop
cascardo has joined #freedesktop
cascardo_ has quit [Ping timeout: 480 seconds]
AbleBacon has quit [Read error: Connection reset by peer]
JanC has joined #freedesktop
mrpops2ko has quit []
JanC is now known as Guest9070
JanC has joined #freedesktop
Guest9070 has quit [Ping timeout: 480 seconds]
jsa1 has joined #freedesktop
abhimanyu has quit []
JanC has quit [Ping timeout: 480 seconds]
swatish2 has quit [Ping timeout: 480 seconds]
swatish2 has joined #freedesktop
JanC has joined #freedesktop
karenw has joined #freedesktop
swatish21 has joined #freedesktop
swatish2 has quit [Ping timeout: 480 seconds]
lynxeye has joined #freedesktop
MrCooper_ has joined #freedesktop
MrCooper has quit [Ping timeout: 480 seconds]
abhimanyu has joined #freedesktop
mrpops2ko has joined #freedesktop
mrpops2ko has quit []
Haaninjo has joined #freedesktop
spareproject has joined #freedesktop
JanC is now known as Guest9085
JanC has joined #freedesktop
Guest9085 has quit [Ping timeout: 480 seconds]
JanC is now known as Guest9086
JanC has joined #freedesktop
Guest9086 has quit [Ping timeout: 480 seconds]
JanC is now known as Guest9087
JanC has joined #freedesktop
Guest9087 has quit [Ping timeout: 480 seconds]
mrpops2ko has joined #freedesktop
f_[m] has joined #freedesktop
abhimanyu1 has joined #freedesktop
abhimanyu has quit [Ping timeout: 480 seconds]
txtsd has quit [Remote host closed the connection]
txtsd has joined #freedesktop
abhimanyu1 has quit []
karenw has quit [Ping timeout: 480 seconds]
lsd|2 has joined #freedesktop
swatish21 has quit [Ping timeout: 480 seconds]
abhimanyu1 has joined #freedesktop
<alatiera[m]>
DavidHeidelberg: do we have a room for marge?
<alatiera[m]>
irc or matrix
mrpops2ko has quit []
usc has joined #freedesktop
psychon has quit [Read error: Connection reset by peer]
mrpops2ko has joined #freedesktop
bmodem has joined #freedesktop
<pq>
What do people do with Gitlab branches they have used for a MR that didn't make it? I'd prefer to rename the branch from mr/laalaa to closed/laalaa, but that does not seem in any way possible.
MrCooper_ is now known as MrCooper
<MrCooper>
not sure I'm quite following: the MR didn't make it, but remains open?
<pq>
the MR is closed, and won't re-open
<MrCooper>
then what is the problem with renaming the branch?
<pq>
I didn't try it, but since it is not possible to point an existing MR to another branch, nor to rename a branch in Gitlab, I presume renaming would be equivalent to deleting the branch.
<MrCooper>
right, and? :)
<pq>
I tried deleting the branch, and Gitlab warned about losing data, but looks like it finds the commits for a moment still at least.
<pq>
I wouldn't want to make a MR page say code not found, but I also have no use for the branch myself.
<pq>
Is deleting the branch safe, in that the MR page doesn't lose anything?
<MrCooper>
my assumption has been that the MR keeps the commits alive, I'm not sure though
<pq>
hmm, I might accidentally later create a branch with the same name for an unrelated purpose, that might mess up?
<MrCooper>
does the warning specifically mention MRs?
<pq>
I don't think it did.
<MrCooper>
IIRC the branch name of a merged MR can be re-used, not sure about closed though, since it could be re-opened anytime
<svuorela>
I think I repeatedly have (mostly on other gitlab instances) made misc-fixes branches
swatish2 has joined #freedesktop
Caterpillar has joined #freedesktop
AbleBacon has joined #freedesktop
phire_ has joined #freedesktop
phire is now known as Guest9109
phire_ is now known as phire
tzimmermann has quit [Quit: Leaving]
Guest9109 has quit [Ping timeout: 480 seconds]
swatish2 has quit [Ping timeout: 480 seconds]
cyantree has joined #freedesktop
cyantree has quit [Remote host closed the connection]
cyantree has joined #freedesktop
cyantree has left #freedesktop [#freedesktop]
ManMower has quit [Read error: Connection reset by peer]
<eric_engestrom>
pq, MrCooper: yeah gitlab never deletes commits, so it's perfectly safe to delete a branch when you close an MR (and deleting the branch will auto-close the MR), the MR will continue to show the commits as they were when the branch was deleted, and if you create a new branch later with the same name it won't confuse gitlab and the old MR will not be touched
lsd|2|2 has joined #freedesktop
<MrCooper>
eric_engestrom: I wonder what happens if the MR is reopened though
<eric_engestrom>
if the branch doesn't exist, iirc it throws an error; if the branch does exist, it updates the MR to the new state of the branch
<eric_engestrom>
(not 100% sure on the "error if branch doesn't exist", I haven't done that in forever)
<eric_engestrom>
(but also that's not an interesting case ^^)
lsd|2 has quit [Ping timeout: 480 seconds]
<MrCooper>
that could be confusing when re-using the same name for an unrelated branch
<heftig>
ndufresne: you could open the MR in webide. it will open up to 10 diffs by default, and you can diff the rest by right-clicking on the affected files in the tree and choosing to compare with the merge request base
<psykose>
does it not work to press expand file? expands for me and allows leaving a comment though i didn't try submitting it
swatish2 has joined #freedesktop
karenw has joined #freedesktop
<DavidHeidelberg>
alatiera[m]: nope, no room
usc has quit []
psychon has joined #freedesktop
mvlad has joined #freedesktop
swatish2 has quit [Ping timeout: 480 seconds]
<ndufresne>
psykose: the error is after tryign to expand, so no
<ndufresne>
heftig: I'll try webide, I need to comment inline, hopefully that works
<heftig>
ndufresne: it doesn't
<heftig>
or at least i didn't see it
<ndufresne>
yeah, no, I does not give me anything useful
<ndufresne>
its a 6K line of code file, but as its brand new, it would be weird to split just to workaround tool limitations
<heftig>
ah right, that file doesn't display at all, so you can't inline comment
lynxeye has quit [Quit: Leaving.]
jsa1 has joined #freedesktop
spareproject has quit [Remote host closed the connection]