Batch merging of branch code and comments

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

Moderator: SourceGear

Post Reply
brewer531
Posts: 26
Joined: Tue Aug 31, 2004 3:07 pm

Batch merging of branch code and comments

Post by brewer531 » Tue Aug 31, 2004 3:15 pm

I would like to be able to merge my entire engineering team's changes to a branched version of our code base into the trunk. The problem I'm having is that when I merge everyone's changes, 1) the user who made the change is not preserved and 2) more importantly, I have to re-type the comments that each person used in their check in. Does Vault have any kind of batch merging facility? The new merge branches wizard merges everything but the end result is that I have a bunch of files checked out and am faced with retyping a bunch of comments. I thought I remember version 1 of Vault doing this when I originally evaluated it.

Jeff Brewer
Paycycle, Inc.

p.s. Vault has been a fantasic replacement for VSS. Our company was looking at CVS and I'm sure glad we didn't go that route.

ericsink
Posts: 346
Joined: Mon Dec 15, 2003 1:52 pm
Location: SourceGear
Contact:

Re: Batch merging of branch code and comments

Post by ericsink » Tue Aug 31, 2004 3:35 pm

brewer531 wrote:I would like to be able to merge my entire engineering team's changes to a branched version of our code base into the trunk. The problem I'm having is that when I merge everyone's changes, 1) the user who made the change is not preserved and 2) more importantly, I have to re-type the comments that each person used in their check in. Does Vault have any kind of batch merging facility? The new merge branches wizard merges everything but the end result is that I have a bunch of files checked out and am faced with retyping a bunch of comments. I thought I remember version 1 of Vault doing this when I originally evaluated it.
I don't think Vault has ever done either of these two things. Version 2.1 will copy the comments over during the merge operation. However, the merge operation is still attributed to the user who did not the merge, not to the user (s) who made the changes being merged.
brewer531 wrote:p.s. Vault has been a fantasic replacement for VSS. Our company was looking at CVS and I'm sure glad we didn't go that route.
Thanks! :-)
Eric Sink
Software Craftsman
SourceGear

Post Reply