SCC Differences report is definitely showing wrong repository version - ignoring active branch tag

( CVSSCC )

Type: Public Status:Closed Created: 21 Apr 04 04:00 Updated: 26 Apr 04 04:00

--> Igor Pushkov (admin) at 26 Apr 04 04:00 writes

Fixed in 1.2.040426

--> Igor Pushkov (admin) at 22 Apr 04 04:00 writes

Merging will work correctly if file is on specified branch. To check
this you can open properties dialog and see the tag field. Also you
can see the same in history dialog.
Exception is new files added to project. They will be also added to
active branch, of entire folder is on this branch. This is
automatically done when you update branch in wincvs, or leave option
"Apply sticky options for folder" using plug-in (option on by
default).
I only want to notice, that when you create branch, no actually any
copying or version redefinition occurs. Than mean that when you
check-in (commit) first version on some branch it will be merged with
head branch, and only next versions will be merged with "branch"
version. Exactly this can confuse you.
You always ca use history dialog, to check to which branch version is
committed.

--> Allen Marshall (user) at 22 Apr 04 04:00 writes

So, my observation was correct - HEAD is not in fact latest for BRANCH. It
would be a huge help if it recognized the active branch automatically.
Or, provide a lookup dialog. I am still thinking the commits are going to
the HEAD instead of the BRANCH tip. That you need to look into. Create
some code with 2 branches and a main stream, check out the branch, edit,
and just check in. From time to time it appears to merge the changes with
the HEAD, not the BRANCH tip.

Your product is however very useful even with these cautions. A bit more
work can make it much more idiot-proof.

--> Igor Pushkov (admin) at 22 Apr 04 04:00 writes

Check box and branch combo in "Connect to CVS" dialog have effect only
at initial version pulling ("Open from source control). This is allow
you pull requested branch. Later it is not used.
The same thing can be achieved if you:
1. Pull main branch
2. "Get files" with needed branch.
However this way you can pull files two times, which can take much
more time.
In "Show differences" dialog you can specify "HEAD", "BASE" and exact
version you need to compare. HEAD is always latest version on the main
branch. To compare with latest version on specified branch we should
provide its name, instead of "HEAD". Think we should have some
work around this, to clarify the plug-in behavior.
I assign "Accepted" status for your ticket. This mean that we will
work on this problem, and I will notify you when it will be resolved.

--> Allen Marshall (user) at 21 Apr 04 04:00 writes

I am working on a cvs branch.

When I do 'Show Differences...' it wants to compare my local version of an
object with the HEAD. That's OK, except that it appears to be ignoring the
Branch Tag. I am getting the HEAD of the main code stream or something.
When I go to the CVSSCC Proxy Properties and look at the project, the
Branch is unchecked, even though the proxy started up acknowledging the
branch I am working with. This seems to be a recurring issue of losing
track of the branch and may explain problems I have encountered with
committing work and finding that my work is being merged with older
revisions because the branch tag is being ignored. I frequently find that
this branch check box is coming unchecked for some reason.
Understandably, it really matters a lot that the proxy leave the box
checked and pays attention to the desired branch.

Thank you.

Rate this ticket:

Not useful at all

Partially useful

Useful

Very useful

Ticket

SCC Differences report is definitely showing wrong repository version - ignoring active branch tag