[00:00:02] <aslak> git rebase upstream/master
[00:00:12] *** dblevins has quit IRC
[00:00:48] <aslak> does it say up to date ?
[00:01:48] <mhuniewicz> Now there's conflict
[00:04:53] <mhuniewicz> Is it fine that I keep my Executer?
[00:05:23] <aslak> mhuniewicz, what do you mean ?
[00:05:23] *** dblevins has joined #jbosstesting
[00:05:43] <mhuniewicz> The other two were removed.
[00:05:54] <aslak> mhuniewicz, oh, yea
[00:06:12] <aslak> mhuniewicz, they were removed just because they were a temp hack/fix to a issue in core, cor eis fixed so.. :)
[00:10:23] <mhuniewicz> aslak, it doesn't pass my tests after the update.
[00:12:18] <aslak> mhuniewicz, have you compiled and ran the whole thing ?
[00:12:46] <aslak> mhuniewicz, there is a version change in the root pom, so, if you only run weld-ee-container it probably won't catch taht
[00:15:18] <mhuniewicz> aslak, I got 1.0.0.Final-SNAPSHOT for weld-ee-embedded-1.1.
[00:15:31] <aslak> arq core update
[00:15:36] <mhuniewicz> 1.0.0-beta-3 for shirnkwrap-impl-base.
[00:15:49] <mhuniewicz> And arquillian-junit-container is 1.0.0.CR1.
[00:15:59] <aslak> cr1?
[00:16:15] <mhuniewicz> Yes.
[00:16:23] <aslak> hmm, that should be cr2
[00:17:08] <aslak> https://github.com/arquillian/arquillian-container-weld/blob/master/pom.xml
[00:17:11] <mhuniewicz> Anyway, if I add those removed observers - it works.
[00:17:32] <aslak> mhuniewicz, yes, because your using a v. of core that does not have the fix
[00:17:41] <aslak> https://github.com/arquillian/arquillian-container-weld/blob/master/pom.xml#L33
[00:18:58] <aslak> mhuniewicz, your in the middle of the rebase still?
[00:19:21] <mhuniewicz> aslak, nah, done, I just switched to CD2.
[00:19:23] <mhuniewicz> CR2
[00:19:36] <aslak> cuz there is a commit after the removal of the observers that updates arq core v
[00:21:49] <mhuniewicz> Looking good after CR2.
[00:22:10] <aslak> mhuniewicz, that depends on your git history.. :)
[00:22:24] <mhuniewicz> aslak, how do you mean?
[00:22:56] <aslak> mhuniewicz, the point of the rebase is to place your commits after the ones in master, for a continues timeline
[00:23:18] <aslak> if you didn't get updated to CR2, then i doubt you are on top of master
[00:23:21] <mhuniewicz> Oh yeah I know that.
[00:23:27] <aslak> but if you push to your repo we can see how it looks
[00:23:31] <mhuniewicz> I mean,
[00:23:42] <mhuniewicz> I updated my sample project to use CR2.
[00:23:53] <aslak> oh, your sample project.. :)
[00:26:18] <mhuniewicz> OK now I push my InjectPC branch to origin yeah?
[00:26:24] <aslak> yea
[00:29:15] <mhuniewicz> Rejected...
[00:29:31] <aslak> mhuniewicz, yea, the rebase does that to it..  you need to force it -f
[00:29:45] <mhuniewicz> Force the push?
[00:29:50] <aslak> yea
[00:30:06] <aslak> basically tell it to screw what ever is on the server, what you push is what you want
[00:30:52] <mhuniewicz> :)
[00:30:54] <mhuniewicz> Done.
[00:31:25] <aslak> ther eyou, that looks better
[00:32:51] <aslak> mhuniewicz, you should add some testcase to the test suite as well
[00:33:19] <aslak> using hsql
[00:33:31] <mhuniewicz> To what? Arquilliand weld ee?
[00:33:37] <aslak> yea
[00:33:49] <aslak> weld-ee-embedded/src/java/test
[00:36:12] <mhuniewicz> aslak, good point. Should I do what my sample app tests or just inject entity manager and see if it's not null?
[00:36:57] <aslak> mhuniewicz, i havn't looked at the same app, but, make sure it does 'something' with the entitymanager
[00:37:09] <mhuniewicz> Should it have some fake entities?
[00:37:29] <aslak> mhuniewicz, yea, just make some simple test entities
[00:38:27] <aslak> bed time here.. :)
[00:38:35] <mhuniewicz> aslak, before you go,
[00:38:40] <mhuniewicz> what's my modus operandi for this?
[00:38:45] <mhuniewicz> Should I work on my branch still?
[00:38:51] <aslak> yea
[00:39:22] <mhuniewicz> OK cheers mate
[00:41:20] *** bleathem has quit IRC
[00:42:31] <aslak> we just keep on in that branch on that pull request until done. :)
[00:42:34] <aslak> night
[00:42:36] *** aslak has quit IRC
[00:46:51] *** mhuniewicz has quit IRC
[01:06:02] *** bobmcw_ has quit IRC
[01:06:21] *** bobmcw has joined #jbosstesting
[01:27:50] *** dblevins has quit IRC
[01:32:54] *** dblevins has joined #jbosstesting
[01:43:42] *** bleathem has joined #jbosstesting
[02:23:09] *** lightguard_jp has quit IRC
[02:38:56] *** ldimaggi has joined #jbosstesting
[03:48:19] *** k4ffee has quit IRC
[03:52:20] *** k4ffee has joined #jbosstesting
[05:25:46] *** ldimaggi has quit IRC
[06:08:05] <jbossbot> git [arquillian-showcase] push master 442f246.. Dan Allen rename test case
[06:08:05] <jbossbot> git [arquillian-showcase] push master URL: http://github.com/arquillian/arquillian-showcase/compare/64ef854...442f246
[06:09:49] <jbossbot> git [arquillian-showcase] push master 0212a72.. Dan Allen rename test case
[06:09:49] <jbossbot> git [arquillian-showcase] push master URL: http://github.com/arquillian/arquillian-showcase/compare/442f246...0212a72
[07:15:56] *** oskutka has quit IRC
[07:25:58] *** bleathem has quit IRC
[08:30:42] *** ge0ffrey has joined #jbosstesting
[09:06:44] *** aslak has joined #jbosstesting
[09:51:04] *** oskutka has joined #jbosstesting
[10:12:48] *** stuartdouglas has joined #jbosstesting
[10:33:57] *** oskutka has quit IRC
[12:57:49] *** OndraZizka has quit IRC
[15:58:23] *** k4ffee has quit IRC
[15:58:31] *** k4ffee has joined #jbosstesting
[18:13:44] *** bleathem has joined #jbosstesting
[18:23:24] *** ge0ffrey has quit IRC
[18:37:06] *** ge0ffrey has joined #jbosstesting
[18:44:28] *** nilian has joined #jbosstesting
[20:24:52] *** ge0ffrey has quit IRC
[20:38:40] *** aslak has quit IRC
[21:13:12] *** nilian has quit IRC
[23:28:03] *** ldimaggi has joined #jbosstesting





top