[evs] Branching on commit, merge documentation

Arthur Barrett arthur.barrett at march-hare.com
Tue Sep 11 03:40:20 BST 2007

Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


> First question is whether the start of the merge is documented in the RCS
> file. A bugid changeset in the simplest case is a range of revisions that
> has a start and an end. You say the merge point is stored in the RCS file,
> but as I understand merge points, that just identifies the end revision of
> the source branch and the target revision on the current branch (where the
> merge happened) -- it doesn't identify the start revision of the merged
> change set on the source branch. This can be expanded to several ranges
> with a start/end revision pair that belong to that one bugid. Does this 
> all
> appear in the log output?

OK - that's a good suggestion, but there are other solutions that would not 
require coding a new feature into CVSNT (though that would be ideal).

> The other question is about the bugid. I think it would definitely be
> helpful to have the bugid stored together with the other merge information
> and be able to retrieve it later.

It's stored in the RCS file same as the mergepoint, so it already is.

> With both of these, you could pull up a revision graph of a file, and see
> which bugids have been merged, from what branch, and what revisions did 
> get
> merged in for each bugid.

Yes, provided that after your merge you commit with the same bug id then 
you've got all the information to do just that - and that is the current 
solution.  Of course the revision graph utility would need to be updated to 
show that, I've already submitted a patch to TCVS so the revision graph 
displays bug numbers (should be in 10.1), but my patch does not graphically 
display the start/end of the merge.  I've created bug id 5079 in our 
bugzilla to track this, but you could also suggest it on the tortoisecvs 
newsgroup or buglist.

>> None of this is obviously in the manual... ;)  Do you want commit rights
>> to the repo so you can amend the docbook?  You can either get a docbook
>> editor (I can dig up the name of the one Tony uses) or you can just use
>> notepad for small changes (which is what I do).
> On this feature I'd have to do some testing to understand it better before
> I write about it, but on other things I may be able to help with the
> manual. So yes, I'd like that (and the name of Tony's docbook editor).

OK - I'll try and get that done in the next couple of days.  If you haven't 
heard from me or Tony by this time next week please ping me...



More information about the evs mailing list