[cvsnt] Mergepoint question

Bo Berglund bo.berglund at removethis.system3r.se
Sat Jul 19 08:40:05 BST 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 have seen the items concerning merges in a recent very long thread
so I am creating a new for the merge question I have...

I can't understand how the server can know where the merge actually
takes place, can someone please explain this?

AFAIK the merge operation will for example take data from a branch and
'push' it into the *working copy* in my sandbox. But this is not to
say that this edit actually will be committed! I have made several
attempts at merging some code that lived too long on the branch and
found that the result was less than acceptable. So instead I have made
some manual adjustments and committed this (basically just replacing
the HEAD code with the tip of the branch without merging anything).

If the server notes the request for a merge and remembers where it was
done and then assumes that these changes are what gets committed then
in my view it is assuming too much.
What happens for example if multiple merge requests are done with
varying parameters or if several developers ar trying to merge at the
same time, or if the merge result is abandoned for now???

/Bo Berglund

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