[cvsnt] Re: When is the best time(s) to merge changes intothemaintrunk?

[James Neave]

Hi,

Well, I am also not the best man to ask about documentation and
explanations.

But here's my 2p.

Whereas I'm sure your doc is a good technical explanation of
mergepoints, I am not a cvs or source control expert.

Maybe you could start with a simple explanation, mostly for the new
CVSNT user (me), about what it does.

(Correct me if I'm wrong)

---
It ensures that changes that are made to a dev branch are only merged
once, even after subsequent merges using the same branch.
---

I think that's a good frame of reference from which to explain in more
detail how it works.

I think a diagram wouldn't go amiss to, showing the mergepoint as a
forward-only sliding marker on the branch, red (don't merge) up he
branch and green (do merge) down the branch.

It's a bloody good feature and certainly would have influenced my
decision when shopping for source control to replace VSS.

Even though I chose it anyway...

Jim.

-----Original Message-----
From: Glen Starrett [mailto:grstarrett at cox.net] 
Sent: 27 April 2005 17:15
To: cvsnt at cvsnt.org
Subject: Re: [cvsnt] Re: When is the best time(s) to merge changes
intothemaintrunk?

James Neave wrote:
> Aha!
> 
> So *THAT'S* what mergepoints do.
> I read about them on CVSNT.org and didn't really get the explanation.
> 
> Why couldn't they have just said what you just said!?

What would you change on that page?  I wrote the original copy awhile 
back to try and explain it, but I never claimed to be a documentation 
expert and am open to suggestion :)

http://www.cvsnt.org/wiki/MergePoint

> 
> So if I was using CVS Classic, lots of small merges would be insane?

Yes

Regards,

-- 
Glen Starrett
_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt

The information in this email is confidential and may be legally privileged.  It is intended solely for the addressee.  Access to this email by anyone else is unauthorised.

If you are not the intended recipient, any disclosure, copying, distribution or any action taken or omitted to be taken in reliance on it is prohibited and may be unlawful.

The contents of an attachment to this email may contain software viruses that could damage your own computer systems.  Whilst The Spur Group of Companies has taken every precaution to minimise the risk, we cannot accept liability for any damage that you sustain as a result of software viruses.