| 00:13.16 | *** join/#uphpu itimber (~Adium@204.10.232.242) |
| 00:13.16 | *** mode/#UPHPU [+v itimber] by ChanServ |
| 02:03.10 | *** join/#uphpu kendsnyder (~kendsnyde@207-224-200-141.slkc.qwest.net) |
| 02:03.10 | *** mode/#UPHPU [+v kendsnyder] by ChanServ |
| 02:21.04 | *** join/#uphpu ninnypants1 (~ninnypant@unaffiliated/ninnypants) |
| 02:21.04 | *** mode/#UPHPU [+v ninnypants1] by ChanServ |
| 02:31.36 | *** join/#uphpu fridgesm_ (~fridgesm@plug.org) |
| 02:31.36 | *** mode/#UPHPU [+v stevecoug] by ChanServ |
| 02:41.49 | DexterTheDragon | mindjuju: ping |
| 02:54.54 | *** join/#uphpu TuxToaster (~TuxToaste@c-24-10-187-146.hsd1.ut.comcast.net) |
| 02:54.55 | *** mode/#UPHPU [+v TuxToaster] by ChanServ |
| 03:11.58 | *** join/#uphpu opapo (~quassel@75-169-191-169.slkc.qwest.net) |
| 03:11.58 | *** mode/#UPHPU [+v opapo] by ChanServ |
| 03:17.18 | *** join/#uphpu davad (~davad@c-98-202-243-63.hsd1.ut.comcast.net) |
| 03:25.33 | *** join/#uphpu kendsnyder (~kendsnyde@207-224-200-141.slkc.qwest.net) |
| 03:25.33 | *** mode/#UPHPU [+v kendsnyder] by ChanServ |
| 05:09.03 | ninnypants1 | DexterTheDragon: ping |
| 05:14.22 | *** join/#uphpu supernovia (~Adium@208.64.91.46.static.utbb.net) |
| 05:14.22 | *** mode/#UPHPU [+v supernovia] by ChanServ |
| 05:15.12 | *** join/#uphpu fridgesm_ (~fridgesm@plug.org) |
| 05:15.12 | *** mode/#UPHPU [+v stevecoug] by ChanServ |
| 05:59.27 | *** join/#uphpu ninnypants (~ninnypant@unaffiliated/ninnypants) |
| 05:59.30 | *** mode/#UPHPU [+v ninnypants] by ChanServ |
| 06:39.37 | *** join/#uphpu davad (~davad@c-98-202-243-63.hsd1.ut.comcast.net) |
| 06:40.52 | *** join/#uphpu davad (~davad@c-98-202-243-63.hsd1.ut.comcast.net) |
| 06:45.23 | *** join/#uphpu davad_ (~davad@c-98-202-243-63.hsd1.ut.comcast.net) |
| 11:22.39 | *** join/#uphpu johnanderson (~john_ande@192.150.9.201) |
| 11:22.40 | *** mode/#UPHPU [+v johnanderson] by ChanServ |
| 11:23.46 | *** join/#uphpu Heartsbane_ (tsharpe@unaffiliated/heartsbane) |
| 11:23.46 | *** mode/#UPHPU [+v Heartsbane_] by ChanServ |
| 11:24.10 | *** join/#uphpu unum_ (~unum@li32-23.members.linode.com) |
| 12:38.02 | mindjuju | DtD, i'm here |
| 12:38.09 | mindjuju | sorry i missed ya yesterday, twas running errands |
| 12:48.47 | *** join/#uphpu esion (~chatzilla@host86-162-82-33.range86-162.btcentralplus.com) |
| 13:44.29 | *** join/#uphpu itimber (~Adium@204.10.232.242) |
| 13:44.31 | *** mode/#UPHPU [+v itimber] by ChanServ |
| 13:52.46 | *** join/#uphpu MikeHansenMe (~mike@RVTNUTMADS0CU02.mcleodusa.net) |
| 14:05.01 | *** join/#uphpu kendsnyder (~kendsnyde@207-224-200-141.slkc.qwest.net) |
| 14:05.01 | *** mode/#UPHPU [+v kendsnyder] by ChanServ |
| 14:09.46 | *** join/#uphpu ninnypants (~ninnypant@unaffiliated/ninnypants) |
| 14:09.47 | *** mode/#UPHPU [+v ninnypants] by ChanServ |
| 14:27.03 | *** join/#uphpu mahelious (~mahelious@ip65-46-59-10.z59-46-65.customer.algx.net) |
| 14:27.03 | *** mode/#UPHPU [+v mahelious] by ChanServ |
| 14:34.28 | *** join/#uphpu eggyknap (~jtolley@74.36.14.159) |
| 14:34.31 | *** join/#uphpu eggyknap (~jtolley@unaffiliated/eggyknap) |
| 14:34.31 | *** mode/#UPHPU [+v eggyknap] by ChanServ |
| 14:41.58 | *** join/#uphpu macnewbold (~macnewbol@66.219.204.98.provo.dynamic.broadweavenetworks.net) |
| 14:41.59 | *** mode/#UPHPU [+o macnewbold] by ChanServ |
| 14:46.59 | *** join/#uphpu josephscott (~josephsco@192.0.65.252) |
| 14:52.11 | *** join/#uphpu UtahDave (~boucha@63.230.12.160) |
| 14:52.12 | *** mode/#UPHPU [+o UtahDave] by ChanServ |
| 14:53.33 | DexterTheDragon | ninnypants: pong |
| 14:56.24 | *** join/#uphpu supernovia (~Adium@208.64.91.46.static.utbb.net) |
| 14:56.25 | *** mode/#UPHPU [+v supernovia] by ChanServ |
| 14:57.05 | *** join/#uphpu SunSparc (~jonathan@69-27-175-74.acedatacenter.com) |
| 14:57.05 | *** mode/#UPHPU [+v SunSparc] by ChanServ |
| 15:02.30 | SunSparc | statusbar |
| 15:02.38 | SunSparc | :) |
| 15:02.41 | SunSparc | ~statusbar |
| 15:03.26 | SunSparc | ~Thursday |
| 15:03.26 | ibot | "This must be Thursday. I could never get the hang of Thursdays." (Arthur Dent) |
| 15:09.17 | *** join/#uphpu mgeary (~mgeary@wireless.cpe.uchicago.edu) |
| 15:09.17 | *** mode/#UPHPU [+v mgeary] by ChanServ |
| 15:11.49 | ninnypants | DexterTheDragon: can you put your media conversion plugin up on github or send it to me? I'm wanting to get something like that working on my sites and don't want to start from scratch |
| 15:19.07 | DexterTheDragon | ninnypants: yeah I'll get it up on github |
| 15:19.20 | ninnypants | DexterTheDragon: awesome thanks |
| 15:31.12 | *** join/#uphpu wGEric (~wGEric@107.0.84.214) |
| 15:31.12 | *** join/#uphpu wGEric (~wGEric@unaffiliated/wgeric) |
| 15:38.10 | *** join/#uphpu kim27 (~kim27@host-166.arcadia-srv-216-83-132.fiber.net) |
| 15:44.13 | *** join/#uphpu clintberry (~clintberr@75-148-102-17-Utah.hfc.comcastbusiness.net) |
| 15:44.13 | *** mode/#UPHPU [+v clintberry] by ChanServ |
| 15:49.25 | *** join/#uphpu linagee (~linagee@indigeotech.com) |
| 15:49.26 | *** join/#uphpu linagee (~linagee@about/linux/regular/linagee) |
| 16:37.49 | *** join/#uphpu TuxToaster (~TuxToaste@66.219.204.99.provo.dynamic.broadweavenetworks.net) |
| 16:37.49 | *** mode/#UPHPU [+v TuxToaster] by ChanServ |
| 16:52.03 | *** join/#uphpu DC1 (~DC@neutroninteractive-xmission.xmission.com) |
| 16:52.22 | *** part/#uphpu DC1 (~DC@neutroninteractive-xmission.xmission.com) |
| 16:59.04 | DexterTheDragon | ninnypants: good luck https://github.com/DexterTheDragon/dragon-video |
| 17:02.23 | *** join/#uphpu undertakingyou (~undertaki@danix.eaerich.com) |
| 17:02.23 | *** mode/#UPHPU [+v undertakingyou] by ChanServ |
| 17:04.06 | SunSparc | ~convert ninnypants |
| 17:04.25 | ninnypants | DexterTheDragon: thanks |
| 17:05.01 | SunSparc | ~convert 50 ninnypants to dragons |
| 17:05.13 | SunSparc | :) |
| 17:05.38 | DexterTheDragon | ninnypants: and by all means, if you can make any of it work better shoot me a pull request |
| 17:06.59 | ninnypants | DexterTheDragon: that's the plan I think the ffmpeg stuff can actually be dropped for the media stuff native on WP 3.6 and I'm going to work on shortcode integration so that it can use the new audio/video shortcodes and just appends the new formats |
| 17:07.08 | ninnypants | that's what I'm hoping to do at least |
| 17:07.37 | DexterTheDragon | that would be awesome. I haven't looked at 3.6 yet to see what's possible |
| 17:09.08 | ninnypants | I'm liking it I upgraded the wpslc site to 3.6 just for the media stuff and it managed to pull all the data out of the mp3 file I uploaded and as far as I know it was just with pure php |
| 17:24.09 | *** join/#uphpu HumanCell (~Humancell@207.224.214.130) |
| 17:26.03 | *** join/#uphpu kendsnyder (~kendsnyde@65-130-125-19.slkc.qwest.net) |
| 17:26.03 | *** mode/#UPHPU [+v kendsnyder] by ChanServ |
| 18:12.27 | *** join/#uphpu mgeary (~mgeary@wireless.cpe.uchicago.edu) |
| 18:12.27 | *** mode/#UPHPU [+v mgeary] by ChanServ |
| 18:23.30 | *** join/#uphpu josephscott (~josephsco@192.0.65.252) |
| 18:51.00 | *** join/#uphpu mindjuju_ (~mindjuju@173-10-26-193-BusName-utah.ut.hfc.comcastbusiness.net) |
| 19:56.51 | *** join/#uphpu josephscott (~josephsco@104.2.233.72.static.reverse.ltdomains.com) |
| 19:56.52 | *** join/#uphpu mgeary (~mgeary@wireless.cpe.uchicago.edu) |
| 19:56.52 | *** mode/#UPHPU [+v mgeary] by ChanServ |
| 20:19.37 | *** join/#uphpu mgeary (~mgeary@wireless.cpe.uchicago.edu) |
| 20:19.38 | *** mode/#UPHPU [+v mgeary] by ChanServ |
| 20:27.08 | *** join/#uphpu josephscott_ (~josephsco@192.0.65.252) |
| 20:36.09 | TuxToaster | so since the email says you're looking for HD recording of a full day's worth of presentations... got any high capacity SD cards? ;-) |
| 20:37.03 | TuxToaster | I usually use a 32GB card in my camera, but I want to say that only held a few hours worth of video |
| 21:04.49 | *** join/#uphpu jshultz (~jshultz@107.0.84.214) |
| 21:09.44 | stevecoug | TuxToaster - We need about 5 hours worth of recording |
| 21:10.03 | *** join/#uphpu jnbek_ (~jnbek@pdpc/supporter/active/jnbek) |
| 21:10.04 | stevecoug | I think my 32GB card worked last year, recording at 1080p |
| 21:10.04 | *** mode/#UPHPU [+v jnbek_] by ChanServ |
| 21:10.25 | stevecoug | You can always come dump your files during lunch time |
| 21:10.40 | TuxToaster | ah, thought it would be more than five hours |
| 21:14.23 | *** join/#uphpu gshipley_ (~gshipley@cpe-174-099-013-158.nc.res.rr.com) |
| 21:14.53 | TuxToaster | stevecoug: the PHP ones are both on Thu & Fri, not Saturday? |
| 21:15.07 | stevecoug | yes |
| 21:15.20 | TuxToaster | nice |
| 21:15.21 | stevecoug | 5 presentations per day, should be 50 min each |
| 21:15.42 | stevecoug | In fact, in PHP we only have 4 presentations each day |
| 21:16.12 | TuxToaster | yeah, I can probably do it. |
| 21:25.49 | stevecoug | okay, send me an email with your info |
| 21:30.34 | TuxToaster | sure |
| 22:15.25 | *** join/#uphpu undertakingyou (~undertaki@danix.eaerich.com) |
| 22:15.25 | *** mode/#UPHPU [+v undertakingyou] by leguin.freenode.net |
| 22:17.52 | Skinner | Any git masters around? |
| 22:18.06 | Skinner | The project I'm on has a little issue |
| 22:18.32 | Skinner | One developer "accidentally" committed and merged into production a branch that wasn't supposed to happen |
| 22:18.46 | Skinner | work continued and other commits and merges were made |
| 22:18.53 | Skinner | then the developer discovered the mistake |
| 22:19.18 | Skinner | so we're trying to figure out the best way to "undo" his merge to prod |
| 22:19.35 | Skinner | but keeping the other commits that happened after his mistake |
| 22:19.56 | Skinner | any advice or direction would be appreciated. :) |
| 22:28.13 | *** join/#uphpu john_anderson (~john_ande@192.150.9.200) |
| 22:28.14 | *** mode/#UPHPU [+v john_anderson] by ChanServ |
| 22:34.05 | romanovic | Skinner: there's herlo and tierra for starters |
| 22:36.19 | Skinner | I got "command not found" when I tried both herlo and tierra |
| 22:36.22 | Skinner | :D |
| 22:36.31 | Skinner | * wink * |
| 22:36.48 | romanovic | Skinner: i'm not sure what the cleanest, 'best practices' solution for fixing your master branch would be. But you could 1. branch from master just prior to the bad commit |
| 22:37.24 | romanovic | 2. rebase all subsequent commits *except* for the bad commit onto that branch |
| 22:37.46 | jshultz | was the merge what screwed everything up? |
| 22:37.59 | Skinner | yes |
| 22:38.04 | Skinner | jshultz: ^ |
| 22:39.27 | jshultz | I think what romanovic is saying is a good idea. otherwise, you would have to revert back to the first commit prior to the bad commit. that could get messy depending on what all has gone on. There's no real way to just pull out his commit. |
| 22:40.46 | jshultz | look at this: http://stackoverflow.com/questions/4716051/rollback-to-an-old-commit-using-revert-multiple-times |
| 22:40.57 | jshultz | i think that should help |
| 22:43.29 | Skinner | taking a look thanks! :) |
| 22:45.58 | herlo | Skinner: one thought would be to revert those commits |
| 22:46.09 | herlo | do you know which commits were errant? |
| 22:46.15 | romanovic | the problem with both of these solutions is that since it is the production branch, going back several commits and making changes can break EVERY OTHER BRANCH that has already assimilated those changes |
| 22:46.25 | romanovic | possibly |
| 22:47.40 | Skinner | We checked out a commit previous to the bad commit and cherry picked the commits we wanted keep |
| 22:47.55 | Skinner | There haven't been any new branches made since the bad commit (thankfully) |
| 22:48.07 | romanovic | ah |
| 22:48.28 | Skinner | Now our guess is to take what we have now and make commit it |
| 22:48.33 | Skinner | Think that'll work? |
| 22:49.30 | Skinner | so we basically have a detached head now |
| 22:49.38 | Skinner | with all commits except the bad one |
| 22:55.25 | romanovic | i'd suggest putting those changes in their own branch first. git checkout -b <newbranch> will create a new branch and point it at your current commit, re-attaching HEAD |
| 22:58.51 | TuxToaster | ~skinner git |
| 22:58.51 | ibot | ACTION buries git in a giant waterfall... WHOOOOSH! |
| 22:58.58 | TuxToaster | ~ironic |
| 22:59.10 | Skinner | lol |
| 22:59.59 | TuxToaster | ok, so you're essentially trying to get rid of a bad commit (the last commit) on master? |
| 23:00.14 | Skinner | yes except it wasn't the last commit |
| 23:00.23 | Skinner | it was 3 commits ago |
| 23:00.32 | Skinner | bad commit happened |
| 23:00.43 | Skinner | then within 10 - 15 minutes two more good commits happened |
| 23:00.47 | Skinner | all pushed to production |
| 23:00.50 | TuxToaster | so do you want the commits after it? or are you just trying to truncate at that point? |
| 23:01.04 | Skinner | yes, we want to keep the 2nd and 3rd commits |
| 23:01.29 | TuxToaster | hmm, yeah that might make it more complicated then. I used the reflog to essentially back master up from a commit and it worked great |
| 23:01.44 | TuxToaster | but I didn't have any commits after the one I rolled back to that I wanted to keep |
| 23:02.18 | romanovic | if you feel safe demolishing 3 commits from master, and have preserved those 2nd and 3rd commits, you can reset master back to the good commit prior to the bad merge, then merge your branch of preserved changes into master |
| 23:02.40 | TuxToaster | right, that seems like it'd be easier to achieve |
| 23:02.58 | Skinner | ok |
| 23:03.02 | Skinner | we gonna give it a shot |
| 23:03.09 | Skinner | so..... |
| 23:03.24 | Skinner | <newb>how is that accomplished</newb> |
| 23:05.00 | TuxToaster | not sure if there's a better way, what I did was used git reflog to find the commit I Was after |
| 23:05.09 | TuxToaster | since I was trying to undo some bad merges |
| 23:05.33 | TuxToaster | and then I did git reset --hard <hash of commit> |
| 23:06.15 | TuxToaster | err, not sure that's right, now that I look at my history. |
| 23:06.39 | romanovic | first, i'd make sure everything is backed up to prevent any catastrophic loss of data. 2. create a branch for those cherry-picked commits, as mentioned above, if you haven't already. 3. checkout master (or whatever your production branch is) 4. git reset --hard <hash of previous good commit>, like TuxToaster said 5. git merge <preserved-changes-branch> |
| 23:07.04 | TuxToaster | scratch that, that is what I did, I was looking at the wrong history window when I double checked. lol |
| 23:07.39 | romanovic | 6. push the restructured master branch to your shared repo, and make sure all developers pull it down so nobody accidentally bases new work on the old version of master |
| 23:09.39 | Skinner | k we made it to step 5 |
| 23:09.43 | Skinner | ready for step 6 |
| 23:10.00 | Skinner | What's the recommended command to execute that one? :) |
| 23:10.28 | romanovic | while in master branch, just 'git push origin master' |
| 23:10.32 | Skinner | git push <prod> <new-master>? |
| 23:10.57 | Skinner | ah ok |
| 23:10.58 | romanovic | is <new-master> a different name than your production branch before? |
| 23:11.03 | romanovic | yeah thats the idea basically |
| 23:12.16 | romanovic | git push <remote> <production-branch> would be more descriptive |
| 23:23.02 | romanovic | Skinner: any luck? any errors (denied as a non-fast-forward perhaps)? |
| 23:23.16 | Skinner | you da smart man! |
| 23:23.22 | Skinner | we sure are getting that error |
| 23:24.38 | romanovic | normally denying fast forwards is what you want on published branches... but since you knowingly want to restructure the production branch, you can disable it temporarily on the shared repository |
| 23:25.48 | romanovic | get to the shared repo directory, and 'git config receive.denyNonFastForwards false' |
| 23:26.22 | romanovic | then push again, with the force flag. 'git push -f <remote> <production-branch>' |
| 23:26.48 | romanovic | <-- that last command from the client machine, i mean |
| 23:26.53 | Skinner | right |
| 23:26.54 | Skinner | k |
| 23:42.08 | romanovic | so, i've been researching more about fixing production branches when the history is jacked and you've already pushed it |
| 23:43.29 | romanovic | this "positive commit" concept looks like a promising solution that wouldn't require restructuring the production branch, but rather fix problems additively http://sethrobertson.github.io/GitFixUm/fixup.html#pushed |
| 23:43.49 | romanovic | dunno if it works when the bad commit is a merge, but it looks useful |
| 23:45.01 | romanovic | particularly this bit: "Rewriting an old branch with a new branch with a new commit - If the state of a branch is contaminated beyond repair and you have pushed that branch or otherwise do not want to rewrite the existing history, then you can make a new commit which overwrites the original branch with the new one and pretends this was due to a merge." |