| 00:06.26 | *** join/#asterisk-dev tonyclewis (uid6025@gateway/web/irccloud.com/x-bctzureegkxkwesb) |
| 00:15.26 | roramirez | on doc https://wiki.asterisk.org/wiki/display/AST/Gerrit+Usage#GerritUsage-Cherry-Pickingusinggitreview say the command is "git review --cherry-pick {review id} {origin branch}" . In my case the option is --cherrypick not --cherry-pick , is only me? |
| 00:18.49 | gtjoseph | roramirez: that's correct |
| 00:18.54 | coreyfarrell | roramirez: I'm guessing that's a typo on the wiki, mine shows --cherrypick as well. I'm guessing it's because there is also a command 'git cherry-pick'. |
| 00:19.03 | gtjoseph | it's --cherrypick or -x |
| 00:21.55 | roramirez | ok, i dont can edit this page :( or send a draf |
| 00:22.07 | gtjoseph | i'll fix it |
| 00:23.10 | roramirez | good! gtjoseph |
| 00:24.36 | gtjoseph | Done |
| 00:26.38 | roramirez | thanks! |
| 01:08.22 | *** join/#asterisk-dev leedm777 (~leedm777@50-81-28-152.client.mchsi.com) |
| 01:31.31 | *** join/#asterisk-dev superscrat (~asanders@173-17-133-2.client.mchsi.com) |
| 01:33.53 | *** join/#asterisk-dev superscrat (~asanders@173-17-133-2.client.mchsi.com) |
| 01:39.29 | *** join/#asterisk-dev superscrat (~asanders@173-17-133-2.client.mchsi.com) |
| 01:54.50 | *** join/#asterisk-dev superscrat (~asanders@173-17-133-2.client.mchsi.com) |
| 02:24.25 | *** join/#asterisk-dev leedm777 (~leedm777@50-81-28-152.client.mchsi.com) |
| 04:01.55 | *** join/#asterisk-dev jagruti_ (~root@182.70.116.47) |
| 04:02.32 | *** part/#asterisk-dev jagruti_ (~root@182.70.116.47) |
| 05:41.13 | *** join/#asterisk-dev oej (~oej@h87-96-134-129.dynamic.se.alltele.net) |
| 05:41.13 | *** mode/#asterisk-dev [+o oej] by ChanServ |
| 05:52.04 | *** join/#asterisk-dev tuxd00d (~tuxd00d@ip70-162-151-19.ph.ph.cox.net) |
| 07:10.51 | *** join/#asterisk-dev tzafrir (~tzafrir@local.xorcom.com) |
| 07:10.51 | *** mode/#asterisk-dev [+o tzafrir] by ChanServ |
| 07:37.20 | *** join/#asterisk-dev oej (~oej@88.80.164.15) |
| 07:37.21 | *** mode/#asterisk-dev [+o oej] by ChanServ |
| 08:49.41 | *** join/#asterisk-dev otherwiseguy (~otherwise@23-228-175-118.mci.googlefiber.net) |
| 08:59.15 | skrusty | morning |
| 10:04.44 | *** join/#asterisk-dev hehol (~hehol@2001:1438:1009:200:c4d7:3d8c:da0e:9074) |
| 11:28.14 | *** join/#asterisk-dev oej (~oej@static-213-115-251-100.sme.bredbandsbolaget.se) |
| 11:28.14 | *** mode/#asterisk-dev [+o oej] by ChanServ |
| 11:34.09 | oej | Hello! |
| 11:45.53 | *** join/#asterisk-dev italorossi (~Adium@187.60.66.11) |
| 12:00.44 | *** join/#asterisk-dev mjordan (~mjordan@75.76.55.191) |
| 12:00.44 | *** mode/#asterisk-dev [+o mjordan] by ChanServ |
| 12:23.26 | mjordan | coreyfarrell: can you see if you can link to https://gerrit.asterisk.org/110 ? It complains currently that there are no revisions on that review |
| 12:24.51 | *** join/#asterisk-dev oej (~oej@static-213-115-251-100.sme.bredbandsbolaget.se) |
| 12:24.51 | *** mode/#asterisk-dev [+o oej] by ChanServ |
| 12:27.53 | coreyfarrell | mjordan: apparently I posted as a draft so I could post a message on it, then never hit publish. should be good now. |
| 12:30.08 | mjordan | thanks |
| 12:31.16 | mjordan | ponders breakfast |
| 12:32.14 | *** join/#asterisk-dev [TK]D-Fender (~chatzilla@216-191-106-163.dedicated.allstream.net) |
| 12:44.22 | file | ponders pondering |
| 12:46.44 | *** join/#asterisk-dev sgriepentrog (sgriepentr@nat/digium/x-gmgckbnirpdncqkk) |
| 12:51.26 | jsmith | ponders pondering about breakfast |
| 12:56.02 | mjordan | tis a good thing to ponder |
| 13:02.49 | *** join/#asterisk-dev tonyclewis (uid6025@gateway/web/irccloud.com/x-eniazvosfxuhrrfk) |
| 13:11.31 | russellb | mjordan: random thing ... you should be able to enable a "cherry pick" button in gerrit, which might help with backports. |
| 13:11.39 | file | russellb, it's enabled |
| 13:11.47 | russellb | oh cool, i was just looking and didn't see it |
| 13:12.20 | russellb | logging in might help, let's see |
| 13:12.28 | russellb | yes. |
| 13:12.30 | russellb | lolz. |
| 13:12.43 | russellb | NOTHING TO SEE HERE |
| 13:12.46 | file | lawlz |
| 13:15.57 | *** join/#asterisk-dev leedm777 (leedm777@nat/digium/x-cbzuitlkjmqxwutj) |
| 13:20.12 | *** join/#asterisk-dev oej (~oej@static-213-115-251-100.sme.bredbandsbolaget.se) |
| 13:20.12 | *** mode/#asterisk-dev [+o oej] by ChanServ |
| 13:25.53 | *** join/#asterisk-dev roramirez (~rodrigo@186-78-17-129.baf.movistar.cl) |
| 13:51.45 | *** join/#asterisk-dev putnopvut (putnopvut@asterisk/master-of-queues/mmichelson) |
| 13:51.45 | *** mode/#asterisk-dev [+o putnopvut] by ChanServ |
| 13:51.53 | *** join/#asterisk-dev newtonr (RustyNewto@nat/digium/x-awgwumjzedulaagb) |
| 13:51.53 | *** mode/#asterisk-dev [+o newtonr] by ChanServ |
| 14:05.06 | *** join/#asterisk-dev oej (~oej@static-213-115-251-100.sme.bredbandsbolaget.se) |
| 14:05.06 | *** mode/#asterisk-dev [+o oej] by ChanServ |
| 14:05.46 | *** join/#asterisk-dev roramirez (~rodrigo@190.54.225.167) |
| 14:21.05 | *** join/#asterisk-dev kharwell (kharwell@nat/digium/x-lclkrhorwketuced) |
| 14:24.27 | *** join/#asterisk-dev superscrat (~asanders@173-17-133-2.client.mchsi.com) |
| 14:30.27 | *** join/#asterisk-dev rmudgett (rmudgett@nat/digium/x-tjkeejrpttkxpufb) |
| 14:30.38 | *** join/#asterisk-dev rmudgett (rmudgett@nat/digium/x-mxewcyudzukpaoyt) |
| 14:32.54 | *** join/#asterisk-dev anonymouz666 (~anonymouz@201-29-71-247.user.veloxzone.com.br) |
| 14:42.06 | *** join/#asterisk-dev russellb (~russellb@redhat/russellb) |
| 14:42.06 | *** mode/#asterisk-dev [+o russellb] by ChanServ |
| 14:45.07 | *** join/#asterisk-dev mjordan (mjordan@nat/digium/x-lstpscrsgcjajuur) |
| 14:45.07 | *** mode/#asterisk-dev [+o mjordan] by ChanServ |
| 14:46.05 | gtjoseph | mjordan: did you change testsuite to not send to asterisk-dev? I got one to that list again this morning. |
| 14:51.13 | mjordan | gtjoseph: I did after that one. I saw that it sent there and realized I hadn't done it |
| 14:51.20 | gtjoseph | :) |
| 14:54.41 | gtjoseph | file: i copied the alembic scripts from 13 to master, was that nor correct? Should I have regenerated them? |
| 14:55.11 | file | gtjoseph, it may or may not be correct - if the paths have diverged... then you can't use the same script for both |
| 14:55.32 | gtjoseph | hmmm. |
| 14:56.24 | file | an ls shows them as having diverged |
| 14:57.20 | gtjoseph | ok, i'll regenerate them |
| 15:14.53 | gtjoseph | file: the wiki says pjproject 2.2 or greater but it it also doesn't even acknowledge asterisk 13. i'm thinking it's better to bump to 2.3 but i'm going to test an alternative without the group lock. |
| 15:18.24 | file | nods |
| 15:26.16 | *** join/#asterisk-dev sgalarneau (sgalarneau@nat/digium/x-qmlujgiowfwgqilv) |
| 15:27.44 | *** join/#asterisk-dev tonyclewis (uid6025@gateway/web/irccloud.com/x-rbjmdgmftlogsnsu) |
| 15:36.51 | *** join/#asterisk-dev russellb (~russellb@redhat/russellb) |
| 15:36.51 | *** mode/#asterisk-dev [+o russellb] by ChanServ |
| 15:37.45 | gtjoseph | file: you don't happen to have a copy of pjproject 2.2 stashed somewhere, do you. can't get it from their web site any more. |
| 15:38.02 | file | let's see |
| 15:38.17 | file | https://github.com/asterisk/pjproject/tree/pjproject-2.2 |
| 15:38.42 | gtjoseph | oh yeah. :) |
| 15:39.07 | file | 2.4 isn't yet on there, but it will be eventually |
| 15:51.18 | gtjoseph | file: it's working but i'll have to eliminate the passing of the tsx back to the caller. no big deal though. |
| 15:57.31 | file | nifty |
| 16:00.24 | *** join/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 16:41.19 | *** join/#asterisk-dev roramirez (~rodrigo@186-78-15-115.baf.movistar.cl) |
| 17:39.38 | *** join/#asterisk-dev italorossi (~Adium@187.60.66.11) |
| 17:39.48 | *** part/#asterisk-dev italorossi (~Adium@187.60.66.11) |
| 17:55.06 | *** join/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 18:03.46 | *** join/#asterisk-dev ipengineer (~zconkle@static-71-252-134-63.dllstx.fios.verizon.net) |
| 18:10.41 | *** join/#asterisk-dev anthm (~anthm@freeswitch/developer/anthm) |
| 18:12.47 | *** join/#asterisk-dev tzafrir (~tzafrir@bzq-218-28-58.cablep.bezeqint.net) |
| 18:12.47 | *** mode/#asterisk-dev [+o tzafrir] by ChanServ |
| 18:44.19 | mjordan | er |
| 18:44.33 | mjordan | I have no idea why asterisk-commits sent an e-mail to asterisk-dev. |
| 18:44.35 | mjordan | sighs |
| 18:46.19 | sgalarneau | automatic redundant replication? |
| 18:46.47 | sgalarneau | I'm kidding of course |
| 18:47.11 | *** join/#asterisk-dev jameswf (uid27319@gateway/web/irccloud.com/x-jjejpapfplwqcexi) |
| 18:55.27 | *** join/#asterisk-dev Synthase_ (uid63346@gateway/web/irccloud.com/x-gcurhlnzveaunjpo) |
| 19:09.04 | mjordan | file: putnopvut: I actually have a few scripts piling up needing https://gerrit.asterisk.org/#/c/69/ (and I set my branches up poorly) |
| 19:09.18 | putnopvut | mjordan: okay |
| 19:09.50 | mjordan | lesson learned: don't base everything off master when you're doing a sequence of changes |
| 19:10.27 | putnopvut | mjordan: submitted |
| 19:10.48 | mjordan | gracias |
| 19:10.56 | file | mmm... Mexican food... |
| 19:14.05 | putnopvut | I'm liking my git branching. I like that I could easily make separate branches for each of my loop detection tests. |
| 19:14.19 | putnopvut | Hopefully that makes reviews easier to digest than packing a lot of tests in one review. |
| 19:14.55 | file | branches putnopvut |
| 19:15.30 | putnopvut | Great. now there's two of me. |
| 19:15.48 | sgalarneau | could be a local branch |
| 19:15.53 | sgalarneau | in which case it's ok |
| 19:16.05 | sgalarneau | file: already had a burrito today |
| 19:29.40 | *** join/#asterisk-dev otherwiseguy (~otherwise@23-228-175-118.mci.googlefiber.net) |
| 19:34.08 | *** join/#asterisk-dev roramirez (~rodrigo@186-78-15-115.baf.movistar.cl) |
| 19:36.24 | *** join/#asterisk-dev ipengineer_ (~zconkle@static-71-252-134-63.dllstx.fios.verizon.net) |
| 19:39.34 | *** join/#asterisk-dev ipengineer (~zconkle@static-71-252-134-63.dllstx.fios.verizon.net) |
| 19:43.33 | gtjoseph | file: for alembic... if the down revision of my script matches a revision id that exists and is temporally before mine, am I ok or should I be looking at something else? |
| 19:44.24 | file | that I do not know |
| 19:45.24 | gtjoseph | i wonder if there's an alembic test for consistency. |
| 19:45.30 | mjordan | gtjoseph: it will complain |
| 19:45.41 | gtjoseph | nice |
| 19:45.44 | mjordan | gtjoseph: generally, if it has multiple paths (that is, two things claim a down revision), it will get annoyed |
| 19:46.12 | file | yeah, after I re-read it a few times that would be considered branching |
| 19:46.26 | file | if you do "alembic -c config.ini.sample branches" it should tell you so |
| 19:46.36 | gtjoseph | that;s just what i was doing |
| 19:48.22 | gtjoseph | mjordan: file Ok so I have this... http://pastebin.com/AmyJ09VF what should I do about it? |
| 19:48.44 | file | you have to tell alembic to create a new thingy... |
| 19:49.01 | gtjoseph | yeah, ok |
| 19:50.04 | gtjoseph | so i masically delete mine and re submit so it comes after auto dtmf |
| 19:50.13 | file | yes |
| 19:50.25 | file | has to be linear progression |
| 20:03.18 | gtjoseph | putnopvut: what did you do to https://gerrit.asterisk.org/44 and why? |
| 20:12.35 | leifmadsen | mjordan, your crowd system is setup to have access to an email server right? :) |
| 20:12.42 | leifmadsen | e.g. forgot my password should email me? |
| 20:13.28 | putnopvut | gtjoseph: not sure. I can't see anything when I click it... |
| 20:13.41 | putnopvut | What change was that? |
| 20:13.58 | gtjoseph | that's because it's draft but somehow you commited a change that reverted part of what I'd done. |
| 20:14.29 | gtjoseph | putnopvut: try now, i undrafted it. |
| 20:14.31 | mjordan | leifmadsen: it should |
| 20:14.38 | mjordan | leifmadsen: apparently, it may be doing something odd right now |
| 20:14.45 | mjordan | such as putting an internal address in stuff & things |
| 20:14.46 | leifmadsen | ah ok... couldn't login |
| 20:14.52 | mjordan | leifmadsen: want me to reset it? |
| 20:14.57 | leifmadsen | sure why not :) |
| 20:15.00 | leifmadsen | I think I'm leif.madsen :) |
| 20:15.09 | mjordan | I have a leifmadsen and a lmadsen |
| 20:15.12 | leifmadsen | orly |
| 20:15.17 | putnopvut | gtjoseph: I have no idea |
| 20:15.19 | mjordan | rly |
| 20:15.23 | leifmadsen | let me try leifmadsen... maybe it iddn't take my "username" update in gerrit |
| 20:16.29 | leifmadsen | huh neat, so my gerrit username doesn't match my crowd username it seems ;) |
| 20:16.38 | putnopvut | uhhh |
| 20:16.40 | mjordan | ohsnos |
| 20:16.42 | putnopvut | That's so strange |
| 20:16.43 | leifmadsen | confusion avoids :) |
| 20:16.45 | file | leifmadsen, entirely possible |
| 20:16.50 | mjordan | well, you can set your gerrit user to whatever you want |
| 20:16.50 | leifmadsen | well it asks me to insert a username |
| 20:16.54 | leifmadsen | so definitely possible |
| 20:16.56 | mjordan | correct |
| 20:16.59 | gtjoseph | putnopvut: i'm going to have to try and revert it. wish me luck. |
| 20:17.15 | leifmadsen | was confusing since I guess logging into gerrit isn't the gerrit username :) |
| 20:17.16 | file | gtjoseph, easy as pie! |
| 20:17.18 | putnopvut | gtjoseph: Whatever it is I did, I truly apologize. I just wish I know what caused that. |
| 20:17.27 | leifmadsen | gerrit username means nothing! |
| 20:17.30 | putnopvut | I wonder if I pushed something that had the same change ID? |
| 20:17.34 | mjordan | "Set your username for your account. This can be any username, although we highly recommend matching your Atlassian username. To set your username:" |
| 20:17.36 | putnopvut | I mean that seems monumentally unlikely |
| 20:17.53 | mjordan | actually gerrit username means a lot, as it is whatever user you specify when you ssh your git changes |
| 20:17.57 | leifmadsen | huh, I didn't see that last part, and I think I initially logged in with email or somethign silly |
| 20:18.15 | leifmadsen | now that it doens't match, I am going to be perpetually confused |
| 20:18.30 | mjordan | leifmadsen: I'm actually working on updating some of our username tracking stuff |
| 20:18.38 | mjordan | leifmadsen: you *may* have had a few aliases throughout the years |
| 20:18.45 | putnopvut | mjordan: file: Any idea what I might have done to somehow have uploaded a patch set on gtjoseph's review? AFAIK, I never touched it. |
| 20:18.48 | leifmadsen | yea, it turns out that is the case :) |
| 20:18.52 | file | putnopvut, hrm! |
| 20:18.59 | mjordan | putnopvut: change-id is the only way I can see that happening |
| 20:19.05 | mjordan | as that is the magic 'key' that pulls it all together |
| 20:19.08 | leifmadsen | shrugs and goes back to masochistic activities such as writing php |
| 20:19.21 | mjordan | oh god |
| 20:19.26 | file | you didn't edit the commit message either did you? |
| 20:19.52 | putnopvut | Nope |
| 20:20.06 | putnopvut | I edited mjordan's the other day, but that's the only commit message I've edited before. |
| 20:20.19 | file | quite odd |
| 20:20.29 | file | what else were you doing at 2:51PM HSV time? |
| 20:20.32 | putnopvut | plus the review was a draft at the time I uploaded a patch, so I couldn't have done it directly on the review itself. |
| 20:20.38 | gtjoseph | rats, i can't revert it because it was an amend. |
| 20:20.46 | gtjoseph | there's nothing to to back to |
| 20:21.00 | putnopvut | I was either 1) cherry-picking my forward loop detection change into 13, or uploading and publishing new versions of the tests for that change. |
| 20:21.15 | putnopvut | I looked at the Change IDs of all my commits and none of them match with gtjoseph's |
| 20:21.18 | file | very... concerning... |
| 20:21.57 | gtjoseph | weird. it looks like it happened with "Detect potential forwarding loops based on count." |
| 20:22.20 | gtjoseph | well, this will be a test to see if there's a way to go back to an earlier patchset. |
| 20:22.31 | putnopvut | I uploaded and published that this morning and then cherry-picked it to 13 just a little while ago. |
| 20:22.38 | file | gtjoseph, all the patch sets are on it - you can grab whichever |
| 20:23.15 | gtjoseph | no you can't as google just informed me |
| 20:23.33 | putnopvut | Wait, did I somehow cherry-pick your master version? |
| 20:23.45 | putnopvut | And that ended up automatically adding a new patch on the 13 version? |
| 20:23.57 | gtjoseph | hmmm |
| 20:24.12 | putnopvut | I was looking over your master changes. It's possible I clicked "cherry pick" on it instead of my intended review. |
| 20:24.53 | putnopvut | But I would suspect that the notation would mention that instead of "uploaded patch set 4" |
| 20:25.02 | putnopvut | Since patchset 1 mentions that it was cherry-picked. |
| 20:25.29 | file | gtjoseph, okay so - what do you want to do? |
| 20:25.53 | gtjoseph | i think i'm going to leave it for now. i'm almost ready to re-push the master version. |
| 20:26.05 | gtjoseph | let me see if I can push over the 13 version |
| 20:26.07 | putnopvut | I can't believe gerrit won't let you revert to an older patch set. |
| 20:26.32 | leifmadsen | you could likely rebase from the older patchset as a new patchset |
| 20:26.41 | file | yeah |
| 20:26.43 | leifmadsen | so it would be a new commit etc, but same code as before |
| 20:26.53 | file | yup |
| 20:26.58 | file | that's what I was going to suggest |
| 20:27.05 | leifmadsen | ALWAYS MOVE FORWARD PEOPLE |
| 20:27.07 | leifmadsen | ducks |
| 20:27.21 | file | git review -d <review>,<patch set number> will create a local branch with that patchset, then you can rebase and do git review again |
| 20:27.22 | file | pobably. |
| 20:27.23 | leifmadsen | file, careful, that's two things today I might have said correctly |
| 20:27.39 | putnopvut | leifmadsen: you'll even out eventually |
| 20:27.50 | gtjoseph | i don't need to do the git review bit because I already have it. |
| 20:27.54 | gtjoseph | as I want |
| 20:28.02 | leifmadsen | putnopvut, I need a lot more wins to make up for being a loser |
| 20:28.03 | leifmadsen | :D |
| 20:28.13 | gtjoseph | I think I just need to do a new commit with the same change-id |
| 20:28.28 | putnopvut | that should do it |
| 20:28.49 | putnopvut | It seems with git that there is never just one way to do something |
| 20:28.56 | leifmadsen | true that |
| 20:28.59 | gtjoseph | oh no |
| 20:29.03 | leifmadsen | it might as well be perl |
| 20:29.07 | gtjoseph | :) |
| 20:34.16 | rmudgett | gtjoseph: About your alembic merge problem: https://wiki.asterisk.org/wiki/display/AST/Merging+alembic+scripts |
| 20:35.10 | gtjoseph | rmudgett: thanks. didn't see that |
| 20:35.13 | *** join/#asterisk-dev ipengineer (~zconkle@static-71-252-134-63.dllstx.fios.verizon.net) |
| 20:35.13 | *** part/#asterisk-dev gtjoseph (~gtj0@unaffiliated/gtj) |
| 20:35.27 | *** join/#asterisk-dev gtjoseph (~gtj0@unaffiliated/gtj) |
| 21:03.22 | gtjoseph | yay, i just cherry-picked over the messed up 13 change and it worked just fine. |
| 21:03.34 | gtjoseph | putnopvut: you're off the hook. :) |
| 21:06.08 | putnopvut | gtjoseph: yay! |
| 21:09.34 | *** join/#asterisk-dev [TK]D-Fender (~joe@64.235.216.2) |
| 21:16.55 | *** join/#asterisk-dev w9sh (~sph@50-79-224-193-static.hfc.comcastbusiness.net) |
| 21:46.42 | rmudgett | gtjoseph: What creates .sha1 files to ignore? |
| 21:47.02 | gtjoseph | downloading sounds and using an external sounds cache |
| 22:15.13 | *** part/#asterisk-dev mjordan (mjordan@nat/digium/x-lstpscrsgcjajuur) |
| 22:53.19 | *** part/#asterisk-dev kharwell (kharwell@nat/digium/x-lclkrhorwketuced) |
| 23:19.45 | *** join/#asterisk-dev roramirez (~rodrigo@186-78-15-115.baf.movistar.cl) |
| 23:25.09 | *** join/#asterisk-dev superscrat (~asanders@173-17-133-2.client.mchsi.com) |
| 23:38.50 | *** join/#asterisk-dev luckman212_ (~luckman21@unaffiliated/luckman212) |
| 23:49.26 | *** join/#asterisk-dev WIMPy (~wimpy@e183095026.adsl.alicedsl.de) |