It seems a lot to get used to, but I now prefer it over visual sourcesafe anytime. It works really well, and in
reality,manual merges are rarely needed in my experience. You just need to be sure to catch them when they are.
/D
_____________Original message ____________
Subject: Re: [pgadmin-hackers] WinCVS...uuurggh
Sender: pgsql@timfinch.cix.co.uk
Date: Sat, 16 Mar 2002 15:33:30 +0000
At 19:22 14/03/2002 +0000, Dave Page wrote:
>Hi Tim,
>
>You can't see what's on the server in WinCVS easily (if at all). I use
>http://cvs.pgadmin.org/ for that.
Ah, thats a good idea of course.
>To update your local copy, right click the file or folder to update, and
>select Update from the popup menu. Checkout will get you a whole copy as
>you found.
So I simply right click pgAdmin and select Update. I did this but it seemed
to upload more data than download & I had a horrid feeling its was
overwriting the latest stuff. OK, I'll proceed with more courage now.
>Another hint, when you commit files, check all the messages in case you
>get a failure. You may need to update first which will try to auto-merge
>the changes on the server with your changes - if that fails, it saves both
>copies for you to manually merge (it puts markers where the problems are).
>Then commit again...
This CVS thing is not as automated as it sounds!
Really appreciate the help. Strieks me that there are so many things to get
your head round before actually writing a line of CODE!
---------------------------(end of broadcast)---------------------------
TIP 3: if posting/reading through Usenet, please send an appropriate
subscribe-nomail command to majordomo@postgresql.org so that your
message can get through to the mailing list cleanly
