I have been using CVSNT with WinCVS and TortoiseCVS clients for some time but was disappointed because the graphical views were very cluttered in a lot of cases. I gave this a whirl because the graphical log looks real nice. However, I don't see the merge lines on the tree view. Is there something I'm missing? I appologize if this has been addressed before but I can't find a FAQ for this either....
What version of Tk do you have installed?
The curved lines only work with Tk 8.4 and above, otherwise you get error messages when it attempts to draw them.
I just downloaded 126.96.36.199 (ActiveTcl) yesterday so I assume this is the latest (bleeding edge).
You have to work for the merge lines, and all the kinks aren't worked out so things can go wrong.
The important thing is that two complementary tags must exist. They must contain the names of branch (sticky) tags. (The tag of the main line is "trunk" for this purpose.) If the logcanvas browser encounters a pair of tags of the form "mergefrom_<to_tag>" and "mergto_<from_tag>", those tags aree on the corresponding branches, and the remainder of the tag, usually containing the date, matches, then it draws a line. The only thing to do then is to make sure that View -> Tree Layout -> Show Merges is checked in the logbrowser menu.
The tags won't be there unless you put them there. The dialogs that come up when you do a merge will help you. Make sure the "Apply the tag" box is checked when you merge. The functionality is new in tkcvs and it requres two execs, which can cause problems that I haven't quite solved yet. Occasionally the tagging fails. If that happens, you have to tag the merged-from revision yourself. You _always_ have to tag the merged-to revision yourself, because it can't be tagged until it has been checked in, and it can't be checked in until you have examined it for conflicts etc. All this is why I wrote it so the two dialogs are allowed to stay open while you work, and the tag is available to the cut-buffer so you can copy-n-paste.
Am I making sense? Unfortunately CVS itself doesn't keep track of merges, so we have to do something extra to have this.
Ahhhh. I think I see what you mean.
I guess I am used to CVSNT (with WinCVS and TortioseCVS client ends). Both these tools look at the 'mergepoint' keyword. For example, here is a cvs log snip:
date: 2004/05/31 12:10:13; author: prc; state: Exp; lines: +397 -0; kopt: kv; commitid: 64840bb20a40000; mergepoint: 188.8.131.52;
date: 2004/06/14 20:40:19; author: prc; state: Exp; lines: +127 -90; kopt: kv; commitid: 43440ce0d320000; mergepoint: 184.108.40.206;
Merged from SP on 6/14/2004. Dialog box cleanup.
date: 2004/06/10 13:54:50; author: prc; state: Exp; lines: +16 -2; kopt: kv; commitid: 6e840c868290000;
Added browser window for viewing session results.
date: 2004/06/09 13:12:33; author: prc; state: Exp; lines: +430 -23; kopt: kv; commitid: 24440c70cbb0000; mergepoint: 220.127.116.11;
Merged from SP on 6/9/2004. Fixes memory leak.
I have 3 developers working on the same project and in a lot of cases, we hit the same file (but in different areas). We therefore do a lot of merging so that we are all on track. We do use tags but not for intermediate steps, usually just at some milestone. This is because WinCVS and Tortiose display tags like branches in their graphical view and makes things very difficult to read. I liked your client because the tags were in the revision box and also because you have the option to hide empty branches. It provides a much clearer picture on where we stand on a lot of files. The 'You are here' is a fantastic idea as well (ClearCase has this concept, too).
Any chance of picking up the 'mergepoint' keyword?
If it's specific to CvsNT running as the server, It's unlikely I'll do anything about it. (i'd never seen "mergepoint". A search for it on cvshome.org, the Google usenet archive, and CVS Bubbles comes up empty.)
If someone else is interested in having a look, though, it might not be hard to leverage what's already there. The logbrowser appears (and is) formidable, but the parts where it parses the log and handles the tags are fairly straightforward.
Sign up for the SourceForge newsletter:
You seem to have CSS turned off.
Please don't fill out this field.