https://github.com/sarvi/pyjs/compare/master...www.pyj.be
On Monday, November 4, 2013 11:11:25 AM UTC-8, Sarvi Shanmugham wrote: > > > > On Monday, November 4, 2013 6:19:57 AM UTC-8, Maho wrote: >> >> W dniu 02.11.2013 19:34, Sarvi Shanmugham pisze: >> > I went through dry run of the merge. Its been a while and there were a >> > lot of changes. >> > Big ticket Items >> > 1. Kees's change from doted notation to dictionary notation is >> > causing a lot of conflicts in one file. >> > 2. The pyjs_site directory is gone from pyjs.org repo and is >> still >> > exists in pyj.be >> > 3. The Calendar example seems to have gone through development on >> > both sides and from what I can tell for the same feature. >> >> I'm a bit involved into Calendar/Datefield/Montfield. So words "Calendar >> example" triggered me that it's maybe about something mine. However - I >> don't understand what do you mean. What does mean that it have gone >> through development on both sides? >> > During the trial merge I found saw both conflicts as well non > merge-conflicting code that > that seemed like was addressing the same Calendar stuff. > > You can see those changes here > https://github.com/sarvi/pyjs/commits/www.pyj.be > Look in the June timeframe of the commits. > > This is branch is tracking www.pyj.be on github and I thought I will keep > it around as a place to > continue this merging/tracking work as long as it is feasible. My guess it > will these will probably diverge > to point where it doesnt make sense anymore. But until then its worth > exchanging bug fixes and I hope this is vehicle > for it. > > during my dry run, it must my understanding that both sides were tackling > similar problems > and I kept the pyjs.org version(which I presume is your changes) instead > of the pyj.be versions. > Thought yours were cleaner. I could be wrong and they could be completely > different features. > > If you can merge the code to the point where the Calendar stuff was > commited, that would be helpfull. > Or, you can help review my merge when I start it. I am not planning on > working on the merge > until some of kees's concerns with the closure compiler advanced are > addressed. > > Sarvi > > >> -- >> pozdrawiam >> >> Łukasz Mach - lukas...@pagema.net >> > -- --- You received this message because you are subscribed to the Google Groups "Pyjs.org Users" group. To unsubscribe from this group and stop receiving emails from it, send an email to pyjs-users+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
