[cvsnt] How to check the merge state of a branch?

Bo Berglund Bo.Berglund at system3r.se
Tue Nov 4 08:10:38 GMT 2003


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.


I am running CVSNT 2.0.11 on both client and server.
How can I check if the files on a branch have received a merge from TRUNK?
I think I know that somewhere along the development on the branch someone
has committed updates on TRUNK and some of these may have been merged into
the Devel branch.
But now I don't really know if everything has been included. How can I check
this (without looking at each individual file...)?

Or is there a safeguard such that if I merge once more from TRUNK I will be
sure that the earlier edits are not reapplied and only those files still in
need of a merge will be updated/added/removed?

I want to stay in sync with whatever happens on TRUNK for the development
branch so the final merge back into TRUNK will be less of a pain.

/Bo


More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook