* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
@ 2020-08-03 15:07 ` LamaRaz
2020-08-03 16:03 ` Chocimier
` (9 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: LamaRaz @ 2020-08-03 15:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 280 bytes --]
New comment by LamaRaz on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668074684
Comment:
Don't you have this option?
https://29comwzoq712ml5vj5gf479x-wpengine.netdna-ssl.com/wp-content/uploads/2019/10/github-merge-options.png
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
` (9 preceding siblings ...)
2020-08-04 3:52 ` fosslinux
@ 2020-08-04 3:52 ` fosslinux
10 siblings, 0 replies; 11+ messages in thread
From: fosslinux @ 2020-08-04 3:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 207 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668364486
Comment:
Yep, it worked, thanks.
Hopefully a committer can merge soon.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
` (8 preceding siblings ...)
2020-08-04 2:40 ` LamaRaz
@ 2020-08-04 3:52 ` fosslinux
2020-08-04 3:52 ` fosslinux
10 siblings, 0 replies; 11+ messages in thread
From: fosslinux @ 2020-08-04 3:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 166 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668364486
Comment:
Yep, it worked, thanks.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
` (7 preceding siblings ...)
2020-08-03 23:54 ` fosslinux
@ 2020-08-04 2:40 ` LamaRaz
2020-08-04 3:52 ` fosslinux
2020-08-04 3:52 ` fosslinux
10 siblings, 0 replies; 11+ messages in thread
From: LamaRaz @ 2020-08-04 2:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 171 bytes --]
New comment by LamaRaz on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668347051
Comment:
Seems like it worked this time
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
` (6 preceding siblings ...)
2020-08-03 16:52 ` LamaRaz
@ 2020-08-03 23:54 ` fosslinux
2020-08-04 2:40 ` LamaRaz
` (2 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: fosslinux @ 2020-08-03 23:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 519 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668296349
Comment:
To squash:
`git rebase -i HEAD~2`
Then replace the second commit with `f` or `s` (fixup or squash).
Exit the editor and it will squash them.
https://thoughtbot.com/blog/git-interactive-rebase-squash-amend-rewriting-history <-- I recommed this greatly for interactive rebase, this tutorial is made for this exact scenario when a reviewer asks you to do something :D
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
` (5 preceding siblings ...)
2020-08-03 16:49 ` LamaRaz
@ 2020-08-03 16:52 ` LamaRaz
2020-08-03 23:54 ` fosslinux
` (3 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: LamaRaz @ 2020-08-03 16:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 386 bytes --]
New comment by LamaRaz on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668128592
Comment:
xbps-src had no issues and I have no idea how to squash it. My attempt despite using HEAD~2 squashed more than was in my branch. My problem was solved, if this pull req is inadequate someone else can update nsjail at a later time and close this.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
` (4 preceding siblings ...)
2020-08-03 16:48 ` LamaRaz
@ 2020-08-03 16:49 ` LamaRaz
2020-08-03 16:52 ` LamaRaz
` (4 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: LamaRaz @ 2020-08-03 16:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by LamaRaz on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668111597
Comment:
no issues with the changes to the template with xbps-src, even with the older kafel.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
` (3 preceding siblings ...)
2020-08-03 16:46 ` LamaRaz
@ 2020-08-03 16:48 ` LamaRaz
2020-08-03 16:49 ` LamaRaz
` (5 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: LamaRaz @ 2020-08-03 16:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by LamaRaz on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668111597
Comment:
no issues with the changes to the template with xbps-src, even with the older kafel.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
` (2 preceding siblings ...)
2020-08-03 16:16 ` LamaRaz
@ 2020-08-03 16:46 ` LamaRaz
2020-08-03 16:48 ` LamaRaz
` (6 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: LamaRaz @ 2020-08-03 16:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
New comment by LamaRaz on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668111597
Comment:
no issues with the changes to the template with xbps-src, even with the older kafel.
that said, I have no idea how to squash it on my side and no interest in figuring it out. If this is inadequate someone else can update nsjail at a later time, my problem was solved with xbps-src.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
2020-08-03 15:07 ` nsjail: update to 3.0 LamaRaz
2020-08-03 16:03 ` Chocimier
@ 2020-08-03 16:16 ` LamaRaz
2020-08-03 16:46 ` LamaRaz
` (7 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: LamaRaz @ 2020-08-03 16:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 225 bytes --]
New comment by LamaRaz on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668111597
Comment:
no issues with the changes to the template with xbps-src, even with the older kafel.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: nsjail: update to 3.0
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
2020-08-03 15:07 ` nsjail: update to 3.0 LamaRaz
@ 2020-08-03 16:03 ` Chocimier
2020-08-03 16:16 ` LamaRaz
` (8 subsequent siblings)
10 siblings, 0 replies; 11+ messages in thread
From: Chocimier @ 2020-08-03 16:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 453 bytes --]
New comment by Chocimier on void-packages repository
https://github.com/void-linux/void-packages/pull/24015#issuecomment-668104867
Comment:
> Don't you have this option?
We disabled all but rebase. Preparing clean git history is here job of person proposing changes, not of person accepting them.
From the fact that proposed update failed to build at first I guess you didn't build and test locally. Did you? If so, what was tested? Any issues?
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2020-08-04 3:52 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24015@inbox.vuxu.org>
2020-08-03 15:07 ` nsjail: update to 3.0 LamaRaz
2020-08-03 16:03 ` Chocimier
2020-08-03 16:16 ` LamaRaz
2020-08-03 16:46 ` LamaRaz
2020-08-03 16:48 ` LamaRaz
2020-08-03 16:49 ` LamaRaz
2020-08-03 16:52 ` LamaRaz
2020-08-03 23:54 ` fosslinux
2020-08-04 2:40 ` LamaRaz
2020-08-04 3:52 ` fosslinux
2020-08-04 3:52 ` fosslinux
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).