On Wed, May 30, 2012 at 5:29 PM, Caleb James DeLisle <[email protected]> wrote:
On 05/30/2012 09:48 AM, Thomas Mortagne wrote:
On Wed, May 30, 2012 at 3:40 PM, Caleb James DeLisle <[email protected]> wrote:
On 05/29/2012 10:07 AM, Thomas Mortagne wrote:
Hi devs,
As I said in another mail I'm working on a diff/merge module to use in XWiki, the first target being Extension Manager and document history (since both are going to use the same code, see Marius mails).
You can see the detail on https://github.com/xwiki/xwiki-commons/pull/2.
TODO/QUESTIONS: * improve the generic 3 ways merge to be at least as good as the List<String> 3 ways merge and get rid of JDiff * not sure where/if I should put String related helpers (things that do a diff on two String instead of having to cut List<String> or List<Character> and call the diff API etc.)
I'm ready to merge it into master so I'm waiting your vote.
Caleb is it OK to put new stuff in master already or should I wait the complete release to be done ?
I'd rather the build be as stable as possible for M2, if you need it then you don't need my permission :)
It's not require to have it in M2, it's just a timing question. I don't mind merging it after your green light.
Thanks, just looked over the code and +1 to it for me. I am curious as to why you chose to make the TYPE enum all caps rather than Type. It seems more natural to use Type.CHANGE rather than TYPE.CHANGE to me.
You are right, that's what I would do generally. This is actually a quick copy past from diff-utils API. I will fix it.
Anyway +1 for me either way.
Caleb
Caleb
Here is my +1.
Thanks,
_______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
_______________________________________________ devs mailing list [email protected] http://lists.xwiki.org/mailman/listinfo/devs
-- Thomas Mortagne