On 29/04/14 08:07, Sushant Raikar wrote: > I am not so comfortable with git,
I see you already got explanations from others -- that's the advantage of the list, as you can see -- and, btw, Vincent's is THE git man here :-)! > http://www.lyx.org/trac/ticket/7964 to latest code base. let me also add a short historical clarification: -) lyx-collaborate-v3.patch: this is my latest patch containing the interactive lyx prototype/mock-up, however it also integrates the chat feature -) lyx-collaborate-v4.patch: the same patch updated to a more recent release by "marspeople" -) lyx-xmpp-chat-v3.patch: last old attempt to rework the chat feature only, based on XMPP This is superseded and made obsolete by my private repo/branch tommaso/chat2: [remote "tommaso"] url = g...@git.lyx.org:developers/tommaso/lyx fetch = +refs/heads/*:refs/remotes/tommaso/* [branch "features/chat2"] remote = tommaso merge = refs/heads/features/chat2 rebase = true So, the work for you would be to: a) start from lyx-collaborate-v4.patch b) cut out the lyx chat part of the feature c) update to current trunk As for b): -) remove GuiChat.{h,cpp} -) remove the "chat" dialog, including ChatUi.ui -) KEEP everything related to the LFUN_COLLABORATE_BIND and LFUN_COLLABORATE_CONNECT code paths Please, keep posting about any doubts you have and issues you encounter. Bye, Tommaso
