Private chat, when? (CVS vs SVN discussion)

by **remko** » Sun Mar 12, 2006 6:11 pm

Do you have any idea when the private chat/messages will be ready? i think my users will like it.

They are very enthousiast about the chat...

by **phpfreechat** » Sun Mar 12, 2006 6:23 pm

I'm working on it, I don't knwo when but soon

by **remko** » Tue Mar 14, 2006 8:36 pm

great....my users really give that as the number 1 option they want.

by **StR** » Fri Mar 17, 2006 9:30 pm

kerphi wrote:I'm working on it, I don't knwo when but soon

Have you started with this? Could you put it in the SVN? I did a co and the trunk is the same as the tag/0.8

by **phpfreechat** » Fri Mar 17, 2006 9:44 pm

I can't commit a unfinished work.
Be patient !

by **StR** » Fri Mar 17, 2006 9:48 pm

kerphi wrote:I can't commit a unfinished work.
Be patient !

Could you make an unstable branch and commit it there? Maybe there is someone else (like me) also trying to do something to help in this so needed feature

by **phpfreechat** » Fri Mar 17, 2006 11:26 pm

Unfortunatly, I'm not familliar with branches.

by **StR** » Sat Mar 18, 2006 12:03 am

kerphi wrote:Unfortunatly, I'm not familliar with branches.

They work just the same way as tags, with svn cp

You could do a svn cp http://server/svn/trunk http://server/svn/branches/unstable and then make the commits to the unstable branch, then cp the unstable branch to the trunk when you consider it to be stable

by **phpfreechat** » Sat Mar 18, 2006 11:09 am

Thank you for you explaination.
However, how to manage conflicts and merges supposing the trunk and the unstable branche change both ?

by **StR** » Mon Mar 20, 2006 2:42 pm

kerphi wrote:how to manage conflicts and merges supposing the trunk and the unstable branche change both ?

I understand that you want to have in the trunk only the latest stable release, right? so it is like a "stable branch". The "unstable branch" will be like your sandbox, where you can try new code, play with it, and always have the latest stable release in the trunk. When you believe that the unstable branch is "stable" you can copy it to the trunk (svn cp branches/unstalbe trunk) and then release it as a tag (cp trunk tags/0.9)

by **Djamoer** » Fri Mar 24, 2006 1:51 pm

I like that idea, and I think it's really usefull when there is a group of people working together on one project.

My suggestion will be to have brances based on each users/coders. So for example we have kerphy branch and str branch. I don't know whether this is achievable on your SVN server or not, but we can limit access to the branches folder, so only the trunk and tag folder will be visible to the public users.

Basically, when you work on something and StR work on something, when you guys decided to release it, one of you guys able to combine both brances from kerphy and StR, and start comparing what needs to be combined and bla bla, then after that time to test the script. If it runs smoothly, then apply it to trunk and later import it to tag folder to be tagged for new release.

It's easy in theory, but it takes quite amount of time to just comparing between 1 file :rolleyes:

by **necrite** » Wed Apr 05, 2006 4:16 pm

I can help with that too..
Why not CVS ?

PS: !Great job MAN !

by **StR** » Wed Apr 05, 2006 4:20 pm

necrite wrote:Why not CVS ?

Because CVS is too old

by **phpfreechat** » Wed Apr 05, 2006 4:42 pm

necrite you want to help about what ?

The reason I choose subversion is: I know very well CVS but lot of project around me switched to subversion, I was curious and I decide to start the phpfreechat developpement with subversion in order to increase my knowledge on that.
Now, my opinion on subversion is not bad:
- in CVS it was impossible to move or rename easily a file, with subversion it's simple
- in CVS it was annoying to add binary files, with subversion it's automatic
- in secured CVS (not pserver) you need to have ssh unix users, with subversion you can use any apache authentification supported system.
In conclusion, subversion is not bad

by **phpfreechat** » Sat Apr 15, 2006 7:47 pm

I submitted the first 1.0 preview : http://www.phpfreechat.net/forum/viewtopic.php?id=235

I choosed to keep 1.x branche on the trunk and to move 0.x branche on a special branche : http://www.phpfreechat.net/svn/branches/0.x/
I will submit only small bug fixes on this 0.x branche and then I will release 0.9.2, 0.9.3 ... when bug will be fixed.
So the big part of the work is just done on the trunk and small bug fixes on 0.x branche will be merged on the trunk when necessary.

Private chat, when? (CVS vs SVN discussion)

Who is online