quotable6

query

squash

result-#moarvm.md

there's a "getting involved" part to that page that could mention the squashathon
squashable6: status
squashable6: status
oh sorry i meant to squash it. you still run the rebase command to do it
if it were me i'd squash it to one commit or a few. or change the description of the commits
squashable6: status
jnthn: think so. I do wonder if I should try to squash the commits. There's a lot of back and forth now in that branch.
jnthn: ops are renamed. Open question is whether we want the twisted commit history or if I should just squash them into 2 commits. Excluding generated code the diff is just: 16 files changed, 329 insertions(+), 25 deletions(-)
jnthn: ok, I'll squash. The 2 commits will be implementation of the nativeinvoke_o op and then JITing that call, too.
^^^ is a cherry-pick and squash of the commits from my branch i linked earlier that just deal with adding MVM_fixed_size_realloc(_at_safepoint), but don't use them anywhere
next i'll cherry-pick and squash the commits that use those for the FSA support in VMArray and PR that
? Community Bug SQUASHathon http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
aye, good idea to squash it
that's rebased and squashed and everything
it's ready for review. haven't yet squashed it but
though idk how it translates since we have to squash things less? idk
is the $work code still hitting any bugs or have you managed to squash them all?
we could squash the whole even-moar-jit into a singel commit :P
If you go through a few rebootstraps then you can squash them into one when merging a branch and then delete the branch, which can save space :)
jnthn: you can't squash jvm's stage0 though, can you?
You can't squash shared history, no
And squashed those before the merge.
This is true, and remarkably similar to how I feel about the warnings I'm squashing.
waits for the ocean swell to fill in, and the car is in the shop, must be time to pick some toe jam and squash some compiler warnings...
and yes, feel free to work further so long as i'm still trying to squash our current one
would you accept my i64_* work into the spesh_trace branch right now, and squashing a new stage0 onto the lexopts branch of nqp?
So then we just merge --squash the branch.
i shall squash the commits
plus it can squash commits into single commits
if it's small enough, you can merge it with --squash to create a single commit

result-#p6dev.md

...we can squash before merging, right? :P
squashing seems like a sensible thing, yes
I'll squash and merge, alrigh?
guess i'll have to squash when i get it working instead :/

result-#perl6-dev.md

Zoffix: so what if I move al ｢testneeded｣ tickets to roast issues and we make a roast squashathon next month?
because, you know, squashathon and hacktoberfest and stuff, it's just so much easier this way
I mean as a general thing, not as an argument against putting them for squashton
I'm surprised so many tickets are left over... I was sure they'd go like hot cakes during squashathon
How the squashaton going?
squashable6, status
squashable6: status
Can someone with keys add `#perl6` to geth's web hook for the duration of squashathon?
is tired of web stuff and goes to hunt for a rakudo ticket to squash
Gonna squashathon tomorrow :)
squashable6: status
to be honest, squashable6 ignores everything before the SQUASHathon starts, so there's no quick way to tell if it's set up correctly right now… :S
ah, also, should squashable6 send stuff to #perl6 or #perl6-dev this time?
squashable6: next
squashable6: status
squash: status
squashable6: status
12:09Z <Zoffix> AlexDaniel: looks like squashathon PRs won't count towards Hacktoberfest for many people: https://irclog.perlgeek.de/perl6/2017-10-03#i_15250088
squashable6: next
squashable6: status
squashable6: status
.in 15h squashathon poster
I saw Zoffix 11:01Z in #perl6: <Zoffix> squashable6: status
Zoffix: squashathon poster
squashable6: status
squashable6: status
… now I just have to figure out what to do with squashable and RT
All the fixes would need one of core devs to merge, so I'm guessing the bot can be told to mark which which PRs got merged during squashathon and then a human can go through them and close all the RTs
during the last squashathon I've been splitting some tickets and creating fresh tickets from old tickets that accumulated some mold. IMO this made a lot of stuff easier to approach
squash them hard! :-)
gfldex: I noticed that during the squashathon it's best to have short tickets with very clear goals
squashable6: status
squashable6: status
squashable6: status
↑ this squashathon will be about rakudo
squashable6: status
Zoffix: hm, not quite sure what to do with the timezone thingy. Currently I've set the bot to use Saturday × UTC-12..UTC+14, but that turns it into a two day squashathon… I mean, sure, that's *very inclusive*, but it does not sound like something we want
I guess if people don't want to start early they simply don't have to, and given the current activity most people won't even notice the point when UTC+14 squashathon starts
AlexDaniel: why not something we want? People don't have to stay around for the whole thing... I was actually thinking of squashatonning on EST Friday, so I could have the 3-day weekend entirely free :)
squashable6: status
if squashable6 gets annoying, just tell it to shut up and it will
? Community Bug SQUASHathon http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
.o( squashable )
? Community Bug SQUASHathon http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
? Community Bug SQUASHathon http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
? Community Bug SQUASHathon http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
AlexDaniel, so that bug is going to be fixed, just running spectest on everything. full details on squashing in #moarvm
MasterDuke, that potential bug should be squashed now with https://github.com/MoarVM/MoarVM/commit/1e92fc9689
is there a recommended way to automate squashing commits on a user's branch for a PR? to me the ideal way would include a single commit message from a file which would read like a changelog for the PR. i ask because i see all kinds of methods suggested and wonder if you might have a standard.
Hm. Looks like encoding refactor should've squashed that bug
sorry for not squashing it :( Just read that its required step
i'm not sure we require squashing commits for pull requests?
// and please squash out any intermediate commits, like adding/removing debug output.
but you don;t have any options beyond make-all-commits or squash-all-commits
Zoffix: create a merge commit, squash and merge or rebase and merge?
if there aren't any further thoughts/comments, would anybody mind merging https://github.com/rakudo/rakudo/pull/1021 and https://github.com/rakudo/rakudo/pull/1018 (and maybe squashing 1018 so there aren't commits that break the jvm build)?
anybody have comments/thoughts/objections on https://github.com/perl6/nqp/pull/345? if not i'll probably squash and merge later tonight
rakudo/nom: Quintuple .lines() bug squash; AlexDaniel++ for discovery
you can squash the revert commits into one
whee, another bug squashed, this took way too much time

result-#perl6.md

¦ perl6.org: �Update squashathon date�
preferably something easy after a relatively difficult rakudo squashathon
maybe some of the 6.d review could be done during the squashathon
6.d squashathon! What a wonderful idea
6.d don't sound like a good idea. A lot of newcomers are interested in squashathon. I thought rakudo was a bit high-level bar as it were; with 6.d it's even worse. What do we tell them? Here's our language spec; look through it and find anything we don't want the language to be like?
squashable6: status
squashable: next
squashable6: log
squashable6: status
but my brains are squashathoned away so please don't be angry at me if I'm saying something really stupid
squashable6: status
squashable6: status
squashable6: status
happy squashathoning everyone o/
squashable6: status
squashable6: status
squashable6:
squashable6: status
squashable6: status
squashable6: log
squashable6: status 2017-10-07
squashable6: status 2017-10-42
squashable6: status 2017-10-01
squashable6: status
squashable: next
heh, looks like squashable counted those as new contributions :)
is getting distracted from squashathon again :)
Hi all, what repo is the target for squashathon?
squashable6, info
I wanted to join in to squash some bugs :) Hope I'm not too late
squashable6: status
It's never too late to squash some bugs
squashable6: status
I can maybe look at that in a bit, but gotta go to a wedding of a friend who neglected to take the squashathon into account, unaccountably...
squashable6: status
18 hours eh... 'nuf time to relax, take a nap, and then squash some more \o/.
good night, keep on squashing!
squashable6: status
squashable6: status
squashable6: status
squashable6: status
squashable6: loud
squashable6: status
squashable6: next
Zoffix: fwiw not only you'd need to have thousands of rakudo builds for running the tests, but squashable has no tests whatsoever /o\
squashable6: status
:) maybe geth should be reporting here too for rakudo/nqp/moarvm during squashatong
squashathon is going on and my wrists require me to not type much :|
So far the squashathons seem to be scheduled when I'm busy. I'm at work now, and then I'm moving this weekend.
squashable6: status
squashable6: status
I guess the squashathon is going to start on Saturday for me. Too tired today :)
squashable6: status
happy squashathoning everyone o/
squashable6: status
Xliff_: also, to circle back to your original statement. Yeah, there are commits to rakudo flying in, but HEAD builds and passes all the tests (and our goal is to keep it in that state, even during squashathons).
squashable6: status
smls: I made the snapshot of the whole RT queue and will diff it against what we get after the squashathon
okay, given that I can't sleep today and that it's already Saturday here… let's squash some tickets :)
Man, 7:59pm. I'm wasting valuable squashathon time :)
squashable6: next
squashable6: status
What will the next squashathon be focusing on?
squashable6: status
Xliff: there's a guide I tried to write for the squashathon, but I don't know if it's helpful. Maybe take a look anyway https://github.com/rakudo/rakudo/wiki/Rakudo-SQUASHathon-Guide
timotimo: Yes, the squashed pair value syntax is warty. I actively discourage myself from using it.
[Coke]: can you set up a webhook for squashable on rakudo repo?
squashable6: status
perlpilot: pm-ed. That's needed for squashable
.oO( maybe squashable6 should not print the “zen” thingy from github… these seem to be a bit off-topic )
hrm, I thought there was a squashaton on
squashable6: status
squashable6: next
squashable6: status
squashable6: next
.tell AlexDaniel looks like squashathon PRs won't count towards Hacktoberfest for many people: https://irclog.perlgeek.de/perl6/2017-10-03#i_15250088
squashable6: next
squashable6: status
squashable6: status
squashable6: status
if we make fanfare around the squashaton for example, and that uses 6lang or rakudo as the language name, that spreads it
squashable6: status
squashable6: status
squashable6: status
squashable6: when?
squashable6: status
Juerd: FWIW I'd love to see you during the squashathon (in two weeks). Nowadays I don't have lots of time too, but squashathons are fun
squashable6: status
squashable6: info
squashable6: status
squashable6: status
¦ perl6.org: �Update squashathon date�
squashable6: status
pompomcrab: ^ I understand next squashathon will be on the compiler. Basically, we all get together in this channel for 1 day and try to fix bugs on the selecter repo :)
squashable6: status
I think I won't wake up in less than 7 hours, so this concludes my squashathoning :) Take care everyone!
squashable6: status
squashable6: status
squashable6: status
squashable6: status
AlexDaniel, ZofBot: what's the next topic for the squashaton? And is anybody writing a summary of the previous one?
squashable6: status
squashable6: status 2017-09-02
what repos are in need of squashathon? doc, roast, rakudo, what else?
sena_kun: this squashathon was a success, but I'd much rather have something else next month :)
by “it” I mean squashable6
???? squashable issue: https://github.com/perl6/whateverable/issues/226
hm, there's some after-effect from the squashathon :)
pmurias: people are contributing more than they did before the squashathon, but the squashathon is over
squashable6: status
squashable6: status
Alright I have to get some sleep. Have a nice squashathon everyone o/
Skarsnik: but please don't hold your breath, I have to sleep and then there's the remaining part of the squashathon… :)
Good morning everyone! I'm hoping to participate in the bug squashathon. :-) Now... to find the easy ones.
squashable6: status
AlexDaniel, go to sleep and squash !
Skarsnik: have to admit the squashathon is addictive :)
.squash
Skarsnik: No such method 'squash' for invocant of type 'Any'. Did you mean 'squish'?
hulkable6, squash
squashable6: status
squashable6: log
squashable6: status
squashable6: status
squashable6: status
squashable6: help
http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html in case somebody missed it :)
squashable6, squash me
squashable6: status
squashable6: status
squashable6: status
so what can we do for this squashathon?
squashable6: help
squashable6: status
Zoffix: well, squashable6 prints one slice for every contribution
squashable6: log
detects an unbalanced parenthesis in squashable6's output
[Coke]: the squashaton is not my doing at all
i'm sorry i couldn't do anything much for the squashathon, i've been afk almost constantly for the last couple of hours
squashable6, status
"11 branches" looks like perl6/doc branches are also in want of a squashing
moritz: “detects an unbalanced parenthesis in squashable6's output” where?
squashable6: status
squashable6, foo
how's the squashathon going
squashable6: log
oh so it's a doc based squashathon
squashable6: status
jdv79: or maybe not, I'm not sure. These are the stats of the current squashathon, not what the current situation is in the repo. But I guess I misunderstood something?
Get some strength for theeeee... SQUASHathoooon \o/ \o/ \o/ http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
? Community Bug SQUASHathon http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
sjn: hopefully it gets taken care of this Saturday during the SQUASHathon :) You should come. http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
I might or might not make it to the squashaton on Saturday, but in any case, I've closed four doc issues now :-)
? Community Bug SQUASHathon http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
? Community Bug SQUASHathon http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
printed the squashathon and camelia came out squashed.
hm, triaging/stating on old bug could be for the next squashathon x)
[Coke]: nice list. We can use some of that for another bug squashathon when perl6/roast or perl6/nqp repo will be involved
huggable: bug squash day :is: https://github.com/rakudo/rakudo/wiki/Monthly-Bug-Squash-Day
AlexDaniel, Added bug squash day as https://github.com/rakudo/rakudo/wiki/Monthly-Bug-Squash-Day
huggable: bug squashathon :is: https://github.com/rakudo/rakudo/wiki/Monthly-Bug-Squash-Day
AlexDaniel, Added bug squashathon as https://github.com/rakudo/rakudo/wiki/Monthly-Bug-Squash-Day
Boom poster: https://temp.perl6.party/squashathon.pdf
mhh squish squash
lizmat: made a blog post you could link to, if you like: http://blogs.perl.org/users/zoffix_znet/2017/08/youre-invited-community-bug-squashathon.html
is there a good ack-like searcher than can squash paragraphs together? I hate it when I discover I missed something I searched for in docs because the pattern spanned a line break
mounted squash image
the mistake of referring to the Perl 5 name instead of the ...::P6::... name, and because it works 90% of the time, it ends up being a really annoying bug to squash. So just naming my bridge exactly the same as the Perl5 module would fix it, but it appears that is just not possible?)
squashfs
oh wait, squashfs, is that like an overlay over the normal FS?
(and, if merged, would prefer it squashed with the previous one)
"I mean, it's sort of loosely analogous to working with Roman numerals instead of Arabic numerals. I mean, it's not that you can't do arithmetic; it's just a bitch. Much more difficult, perhaps, and therefore mentally not -- more constraining. But all of that stuff is now squashed into such a narrow interval that I don't even know when it happened. I remember that the preposterous syntax, the "> >", or whatever syntax that somebo
Perfect music to squash bugs to!
thank you for your relentless bug squashing! :-)
yeah, 'git rebase -i master', then you can shuffle them around and squash them
ah, it's “squash” and not “squish”, oops :)
. o O ( Squash as in pumpkins, volleyball, squash racquets, the filesystem, ??? )
i've tried using stuff like cygwin before in windows. it always feels like i'm in this tiny little plastic oasis, with giant walls surrounding me that may come crashing down at any moment to squash me
jnthn: but seriously, thank you for looking into it. you're bug squashing abilities will never cease to amaze me!
hmm didn't really mean to squash there but it's ok
and speaking of, is there a preference for a merge commit, or squashing?
if you feel that some information is lost due to squashing then don't squash
if you feel that these commits are polluting the history then squash
so no hard and fast rule? then in this case i'll squash
There will be a few more commits and when I am happy with it, will squash.
.oO( HULK squash?! )
a squashed hulk is very bad news for any submarine :-)
Was it possibly the ability to squash multiple commits on PR merge? That is recent.
is that similar to raquetball or squash?
raquetball/squash is about my favorite cardio workout
chalk this one up as a first: fix bug, write regression test for bug, see it pass, interactive rebase to put the commits in the reverse order, `edit` after the test, re-run to see red, rebase --continue, rebase -i again, squash the two commits together
Ah, k. unsquashed commits from earlier on
woah github has commit squashing now, that's epic
MadcapJake: hah! also, i know i'm getting tired because i just went to look up squashing on google and typed 'cmomit squasking'
perlawhirl: yeah, I've submitted a few PRs before where the maintainer says "please squash your commits". It's about keeping a clean commit/feature philosophy
tadzik: i'm not sure if i was supposed to squash the subtree commit history into a single commit. i can do that, though
squash
so i shouldn't squash either?
and uses a squash merge
your hopes have been squashed
Its the one before stuff was squashed into shell__command
riiight. ok. that kinda squashes things.
Yeah, I'm going to see if I can't squash it
rakudo/nom: when squashing, so check that first!
sprocket: That is new and a bit annoying. To squash it I used e.g. is native('crypto', v0 but False)
*fix*; git commit; git rebase -i HEAD~2; change last commit to 's' to squash it; comment out the commit message of the last commit; git push -f
ZoffixWin: 'f' for fixup squashes the commits and throws away the last commit's message
nine: did you mostly just squash them into one commit?
nine: I'll try to remember you like 'em squished for next time (I tend away from squashing/rebasing myself -- lots of commits reminds me of how I got there in the end)
even a module name squashed to ascii alnum's better than nothing :)
anyway, case in point was: "give me squash behavior in perl5 tr/// and something something archimedes"
oh, squash, right
jnthn: how is the bug squashing going?
apparently harmless, and i'm sure it will get squashed soon
It spends most of the time in the sha256 function, really. And the remaining entries are frequently so squashed together I can't really read them
OHHAI, folks -- been a while, it's good to see all that activity around bugsquashing on RT :-)
getting systematic about it would get bugs squashed quicker, and maybe throw up combinations that need some language design thought
[Coke]: well, if it focuses people on the right stuff and produces a "real" pre-6.0 bugcount to squash it might be worth it
.oO( I think all merges should be ｢git merge --no-ff --ff-only｣, only squashing in very few circumstances )
I *squashed* it!
nine: i think i made a mess, i cant push anymore to my branch which means i will have to make a new PR with the squashed commits. is it alright?
smls: I feel your pain. I'm trying to squash an indent-handling bug in my Python grammar >.<
yes, but how do you know what dependencies your dependencies have? you dont know until you download it. no reason that list couldnt be squashed into a de-duped tree so you can go right into paralell downloading/testing
rakudo/nom: Work towards implementing :squash for &Str.trans.
is there any documentation about :squash for .trans? I haven't heard about it before.
in the release announcement, the list of incompatible changes gets squashed into a single line
squash-merges vendethiel
moritz: I sure hope you didn't squash me too much
tadzik: that could be avoided with --squash, if you'd prefer that
so the left parent is the "squashed" commit (and the default that most things see)
I'll do it as a squash merge, so that it'll be easier to revert, should it be necessary
that's the one I want to squash-merge
If he's doing a squash merge he only has to git pull --rebase and then no problem :)
hmm if you squash all git commits you can sign one commit with GPG
and am doing what I can to squash it =)
i'll rebase them locally and do some squashes/rewords
uniq is more like squash consecutive lines, not actually uniquify (unless you sorted first), yeh
that would be why I described Unix uniq's behavior as squashing :p
xfix: neither of those have :squash or :complement, afaik
One of contrived examples is tr/234/122/s which replaces all instances of 2 with 1, and all instances of 3 and 4 with 2 while squashing replacements.
:squash wasn't that hard \o/
roast tests for :c, :squash and :delete, the last of which seems redundant
Woo. Bug squashed.
If you were just told "Learn a Perl, it's good for your brain", then your choice is more open. We tend to believe Perl 6 is pretty good for your brain, but it is not bulletproof, hardened, and ready for large-scale high-volume deployments yet. (We are still working on a few final features, as well as heavily working on optimization, bug squashing, and shaving off the sharp bits of edge cases.)
I'm playing with threads in moar and the stdout/err of the (only) subthread is being squashed by the output of the parent thread.
slava-wr0k: Well, it's what normalization forms are for. NFC chooses the single-codepoint form when it's available, squashing an o + combiner into the single ö.
wonders how confused it gets if you interactive rebase to squash the two :)
timotimo: if you like it, feel free to squash-merge into nom
timotimo: ok, I was impatient, and squash-merged the branch myself
still does not like squashing commits
all the stuff that just got dalek kicked was stuff I had previously squashed at some point, and something I did made it all appear anyway...maybe I didn't squash at the right step or something
methinks they were still unsquashed in my fork when I did another merge
Do it at the command line and --squash, if you don't care for history... ;)
raydiak: Thing is, if you do branches to break things for a while, *not* squashing at merge makes bisecting harder. And unfortunately, there's no --first-parent option to bisect...
will start squashing simple stuff like docs work
so it's no wonder that 0x82 gets squashed down to '?'
.oO( there's a pun about squashing bugs in there somewhere )
TimToady: going off the LHF metaphor, I can think of "squashed fruit", "inedible fruit", and "fruitless tree".
One more squashed NQP bug and we're down to 25 open tickets
dwarring: if that's fine for you, I'd squash all of those commits into one
it's like using a pile-driver to squash a bug, and after doing it 50 times, then checking to see if you were successful the first time
any objections to squash-merging pull request 195 (parse tr/// and die with NYI)?
then you can reorder the patches in your text editor, squash them into one or remove one completely
(basically 'git rebase -i origin/nom', then squash the second commit into the first by changing s/pick/squash/ on the second line)
... surely can. should i squash all those commits quickly before anybody else sees them?
damn it, =for output squashes everything into one line
timotimo: fwiw I've squashed the NQP revision bump into that one commit
(actually I wanted to leave as is, then couldn't push because of a new commit by jnthn++, did a 'git pull --rebase', that got rid of the merge commit, and then I felt inclined to squash the two remaining commits :-)
sorear: so I should squash them into a single commit?
and some time in the future, i shall squash all those useless revert commits and friends
rakudo/extend-dump: Considerable DUMP refactoring, resulting in proper automatic handling of circular data structures -- but also some uninitialized value warnings that still require squashing
r: role R { method foo { say "whee!" } }; class C does R { method foo { say "squash'd!" } }; C.new.foo
rakudo b972ca: OUTPUT«squash'd!�»
what apejens said ... REM is the comment and the @ squashes output
and @ squashes the prompt output
alester: Thanks! I'll keep it in mind when I return to my warning-squashing quest =)
arnsholt++ Yay for warning squashing.
timotimo: thank's for your patches. I --squash'ed them all into one and applied
Not quite done yet, but at least I squashed the inscrutable bug
Segfault squashed. Onto the next failure!
(Hence much time spent squashing any number of NPMCA (Null PMC Access) errors)
masak: mmm. I know exactly why I shouldn't use !important. and yet it's a nice hammer and ends up squashing many issues. ;)
jnthn: if you brain is not too squashy, I'd remind you that I'm still waiting for some review of the export-constant branch
seems to me you're exclusively talking about the use of git-rebase --interactive that squashes commits.
I kinda like the way the topology is flattened. I'm not necessarily advocating squashing commits in the process.
masak: well, squashing commits in one thing, but I wouldn't squash a whole non-trivial branch
Right now I'm trying to squash that annoying segfault bug >.<
I'm trying to squash as many warnings as possible =)
rebase -i is useful for that. If you name a commit "fixup! <old commit>" and use --autosquash (or rebase.autosquash), it'll automatically reorder the commits and apply the bug fixes.
benabik oh, I didn't know about autosquash
did you guys notice, that a bug seems such a simple thing after one squashes it ?
that's a squashed merge of the version branch
Please help me squash all non-idiomatic ugliness
fsergot: no problem. If we really cared, we could have squashed them into one
rakudo/nom: this is a squashed version of these three commits:
kboga: I've squashed in commit that adds that test file to t/spectest.data, otherwise it's your commit unchanged
is there a way to squash something into the first git commit in a repo?
nope, the grey thing is the total number, I just round it up to the next 5000 to stop it looking squashed
baest: I don't like the merge commits, so I'll squash all commit into one
baest++ # needs a bit extra karma, since I squashed his commits into one
tadzik: doh - don't know how to squash the two commits into one patch, and don't have time to learn atm :D
strange. in the act of trying to adjust my broken code to a minimal broken subset, I somehow squashed what was causing the bug...
also, rebase --interactive supports 's' for "squash"ing commits together
but it might have been merged some other way, like with squashed commits or custom messages
moritz_: iirc, they were squashed.
Maybe they were squashed.
change all but the first lines to begin with an s (for "squash")
(but more work. An optimizing compiler could probably squash that.
patrickas: it was a local problem here indeed... I've applied your patches locally, squashed them all into one, and I'm testing it now
yes, that was a bug that's been squashed
patrickas: I'm squashing a few of your commits into one to remove the clutter
that squashes interior parcels
R* might be better, but I really do understand people who want to wait until the worst bugs are squashed.
bkeeler: I'll add that test file, bump PARROT_REVISION and squash these two into your commit, so that it looks a bit more atomic :-)
I'm currently trying to squash a bug in which an array of Ints suddenly magically contains a GGE::Match object.
bkeeler: no need for squashing into one commit
the main item is that we'd like commits to be squashed (easier to review), and that it go to RT so it can be tracked.
Why are you recommending that commits be squashed instead of people working on topic branches? Then you can just review the branch as is without destroying commit information
masak: Is it generally better to just reproduce bugs here or send them to RT? When I started I had no idea that the developers kept such a close eye on traffic to/from the rakudo bot. And yes, I've gotten a bit of squashed fruit in my hair that way.
r29675 | lwall++ | [Spec] squash [;] fossils noticed by eternaleye++
r29624 | lwall++ | [S07] @@ squashing
(pile of bugs) excellent! squash bugs, squash bugs!
I'm all for squashing things, but usually I squash features.
(squash features) -- isn't that what microsoft calls "patch Tuesday" ? ;-)
I meant to squash these two commits
squash my changes in the original patch
colomon: when I applied some of your early patches I squashed them into one because they would partially break things in isolation, not because they were too small on its own
either grumpy or angry, it says "get out of my way or I'll squash you like a..."
colomon: any objections to squashing those four commits into one before pushing?
I don't know how to squash commits yet.
jnthn: so what's your rakudo day today? bug squashing?
moritz_: And I'm keeping open various ones that I'm going to work on squashing today.
dukeleto: I'll squash our commits to make it easier for bisecting
and normally we like the patches to get squashed
jnthn++ # squashing bugs
if we keep PERL6LIB around, some form of the unicode squashing problem is bound to hit us.
and today is pmichaud++'s bug squashing day?
you can't get squashed until you've fixed all the bugs :P
I have to resign to the fact that I'm still a bit squashed and not my usual, energetic self. also, I have to do $WORK. I'm going into lurk mode for today... :)
wayland76: I thought I would actually save y'all some noise by squashing three commits.
were these short patches to begin with? Would we still want someone to squash multiple commits together?
pmichaud: I thought that the github-squashed-feature-branch was also one of the submission methods, but I guess that was mortiz's suggestion
2) if we're on a different branch, squash all changes from the current branch into master, and git-format-patch that commit
(and for the second option require a commit message, because the "squashed commit of..." isn't all that informative)
I think squashing could be helpfu.
pmichaud: no argument at all ... but maybe just have a "--no-squash" option? It's possible I might be on a branch, but not want to merge back to master before sending the patch
yes, squashing should be optional
or have a --squash option
micro-commits are fine -- just squash them at the end.
moritz: did you get a chance to look at the roots_squashed pull request?
dukeleto: I'm now looking at your roots and roots_squashed branches, and neither can be merged cleanly into master... am I missing something crucial?
I tried (on master) git merge leto/roots_squashed, and it gave me quite some conflicts
PerlJam: I just thought he did a merge --squash and resolved the errors on the way
ah, it seems a rebase + squash seems to solve most of it
rebase + squash?
first in the branch 'git rebase master', then in master git merge --squash branch
moritz: i have mostly been squashing bugs, adding docs and tests
and then instead of squashing stuff, you pull fromme (or vice versa) and to see what went down you (or I) just use git diff branch master or whatever
how do i squash the last two commits in my git tree down to one patch?
You can even search its manpage for "squash" :-)
thinks squash should be called "stomp"
gravity: i think the problem was that i was trying to squash the master branch back down into the master branch
one problem is this: for the ease of pmichaud and others we are squashing commits
and if you push and then squash again things are garaunteed to go wrong
maybe squash only a copy of the commit?
and then squash again
so you have both the history and a nice squash
I see good reasons to push feature branches, but do you need to push the squash merges?
i was thinking of maintaining my fork, one branch per feature, squashing the patch and committing to my fork, then submitting that (full patch) to RT as well as the pull request
squashed patches are easier to review than anything else.
so we'll have to do the squashing and RT to get bigger patches with easier review process
wayland76: okay so he said squash the commit, send a pull request, and then submit to RT?
that is, squash them in git as per your instructions, then link the commit on github
s1n: yeah I agree, but what I am saying is that if you push into your own fork and then change some stuff and squash it again it gets mad at you
moritz_: http://nopaste.snit.ch/15858 Any thoughts? (I can squash a patch against current HEAD)
what we're really wanting to have happen is for people to do --squash to convert multiple commits into a single commit to facilitate review.
I'll figure out how to squash it into one commit
doing git rebase -i (supposed to make it easy to squash) can't be easily done if you push your changes to any repo
well, pmichaud said that it would be a lot easier to add stuff if they were squashed into one commit, as then he could easily review them
i just want to make sure i have appropriate fixes for other things, but just want to squash my changes down to a single commit for pmichaud
the squashing is highly useful, but branching constantly is going to be tough when the devs are reviewing patches frequently
so the squash part
you choose one first one and then squash the rest into it
just choose not to squash in the merge
just don't squash those in when they are done
that will keep the merges from other squashes out of the new squash?
lemme few seconds to squash all commits.
moritz_: you can squash few lines in List.reduce :)
@tell cspencer sorry for being inaccurate earlier... if you did only one commit, you don't need to --squash the commit (that only adds more clutter in that case)
cspencer: I think the currently recommended routine is to put all in a branch, and then squash it into a single commit
cspencer: more specifically, when you're done with $branch, git-checkout master; git-merge --squash $branch; git-commit -a
moritz: after doing all of the git squash stuff after i've made my changes, do I use "git diff" to output the patch and then submit that via RT?
alester: also, what's the "squash" option?
well, i really wanted to know about alester's "squash" option
s1n: I don't see anything in the log in this channel from alester mentioning 'squash'
Or checkout master and git merge --squash $BRANCH
how can i better do this? i want to make local commits and then have something easily reviewable, such as squash
git checkout -b foo-work; hack hack hack; git checkout master; <update from origin whatever>; git checkout -b foo-review; git merge --squash foo-work; <push foo-review branch to github>
And what is it that you're wanting to squash and why?
What he should have done is do all his work on a branch, then merge that down into a single --squash commit, and then you have a single commit to work with.
perl5 Test::Tutorial is almost the right kind of Howto for testing. We should ask each test writer to do some preliminary duplicate squashing.
moritz_: you could squash the commits if they're related.
pmurias, squash it ;)
$str.=trans( / \s+ / => ' ' ); # squash all whitespace to one space
r21263 | cjfields++ | add two tests for complement, squash with many-many array match
r21229 | cjfields++ | add complement, deletion, squash tests
r20823 | lwall++ | [STD5] progress in parsing STD, squashed various LazyMap bugs
dlocaus: perl.org squashes most of the spam hitting rt.cpan.org, but, well, some will always leak through
fglock: squashed the bug :) :) :)
: kp6: squashed the containers dispatcher used on value bug
pj: that's our goal. and i think the perl6/win32 bug has been squashed with chromatic's latest patch :)
huh. inline pod's squashed
yes, but do they go *splat* when you squash them?
r14276 | audreyt++ | -- please someone squash them down before release...
audreyt - did you squash the tests that were causing winbugs to have a "this program has encountered a problem and must shut down"?
audreyt - the eval_is/todo(1) test I added for lasting outside of a codref inside of a loop - is that on the hit list for bugs getting squashed before the release?
audreyt - when is the next test fail squashing session and new release tentatively scheduled?
ok - so hopefully new release over the weekend or you think it will take a few days to squash failing test bugs?
TreyHarris: they should go squashed
heheh, by befriending them and therefore not squashing them? :-P
one bug squashed.
Title: Secret Perl Operators: the boolean list squash operator, x!!
I mean, my $HOME is under NFS with root_squash...
r11240 | audreyt++ | * Pugs::Emitter::Perl6::Perl5 - more warnings squash.
I wouldn't expect svk to squash 11000 revisions quickl
r10425 | audreyt++ | * JudyHS: squash compiler warnings and errors in preparation of cmarcelo's
Optimus Prime would squash Castle Greyskull
r8233 | autrijus++ | * also squash whitespaces in .trace forms. Try this:
r7968 | autrijus++ | * oops, squash a redundant 'make register' message
r7563 | iblech++ | * PIL2JS: More squashing of minor bugs
putter: ok, I think that's sane. I don't have tuits to squash those warnings, and I don't think shem as showstopping anyway
I thought I squashed those
you can't squash us all!
it means something that should be squashed. a sec
autrijus - I had to rebuild to squash some more Config.pm errors - but as the entire main test suite passed last time I don't see any reason to suspect there would be new errors this time
r4869, autrijus++ | * squash some wanrnings.
r4889, autrijus++ | * squash another warning
squashed and resurrected, repeated.y
I guess the missing signature warning can be squashed with a proper Unicode.h or something.
assign.t bug squashed.
squashed more test failures
my plan now is to squash test failures