Forum OpenACS Q&A: Re: Chat package HEAD branch

Collapse
9: Re: Chat package HEAD branch (response to 7)
Posted by Emmanuelle Raffenne on 06/18/07 02:19 PM
Hi Pablo,

Since your changes on xotcl-core have been rolled back, the chat package in HEAD is now broken. So I would suggest to do 1 of the 2 following: roll back your previous commit on HEAD, or, commit your fixes into HEAD. The latest might make easier to get and test your code.

Collapse
10: Re: Res: Re: Chat package HEAD branch (response to 9)
Posted by Pablo Muñoz on 06/21/07 03:41 PM
Hi Emmanuelle,

the new version without dependencies is now in the cvs. You can download it from the head branch.

Regards.

Collapse
11: Re: Res: Re: Chat package HEAD branch (response to 10)
Posted by Emmanuelle Raffenne on 06/21/07 04:20 PM
Thanks Pablo.

I've checked it out from the repository to test it. I got errors because packages/chat/tcl/chat-ajax-procs.tcl has been committed with unresolved conflicts. Please, can you review it and resolve the remaining conflicts?

Collapse
12: Re: Res: Re: Res: Re: Chat package HEAD branch (response to 11)
Posted by Pablo Muñoz on 06/22/07 11:11 AM
Hi Emmanuelle,

I changed the file with errors by the corrected file, but I am sorry because I did not notice that there were some conflicts.

Now, I guess the conflicts are solved.

Regards.