Branching/Merging support flaw (should be easy to fix)

If you are having a problem using Vault, post a message here.

Moderator: SourceGear

Post Reply
Phil Hartmann

Branching/Merging support flaw (should be easy to fix)

Post by Phil Hartmann » Mon Jan 24, 2005 4:49 pm

This seems like a rather stupid issue, this should be quite easy to fix..

If I branch out /MyProject/ and my project has 2 files a.c and b.cpp

I now branch into /branches/Intel Job/MyProject/

And I change a.c to a.cpp, with a comment of "Support for C++ constructs" and then check out/in again, thistime with "Fixed crash on application closing".

Then I make a change to b.cpp thats "Added regular expression support"

When I merge back into the MyProject, it would be _VERY VERY_ useful if instead of all of these 'history' things getting globbed into a huge comment (Imagine ongoing developement on a branch for 4 months, now you merge... that comment base is worthless) would actually pull the comments for a.cpp as the TWO that occured, and b.cpp as the ONE that occured for it.

This does not seem complex, and is not helping me on my decision to move this companies version control over to SourceGear vault...

CVS is much better in this respect as the 'tree' is known at the file level, so all the history is inheritly never lost, and always viewable.. using LinCVS I can even get a nice graphical tree of the branches/merges.. CVS is by far more complicated and has other issues with it.

jclausius
Posts: 3706
Joined: Tue Dec 16, 2003 1:17 pm
Location: SourceGear
Contact:

Post by jclausius » Mon Jan 24, 2005 9:43 pm

Phil:

This was answered under the support Forum http://support.sourcegear.com/viewtopic.php?t=2912
Jeff Clausius
SourceGear

Post Reply