[cvsnt] Merging branches.

[James Neave]

Hi,

Right,

If I perform merge A and this merges change X into the development
branch.
Then release and remove the working directory, change X was not checked
into HEAD.
Will that change get merged if I merge again (merge B)

Because I think I practised first.

So a clean copy of HEAD (no changes merged in, but some practises
performed) merged with v1_1_patches using the -b switch will merge every
change made from the branch point (v1_1) up to the end of the branch?

Thanks,

James.

-----Original Message-----
From: Tony Hoyle [mailto:tmh at nodomain.org] 
Sent: 30 March 2005 15:13
To: cvsnt at cvsnt.org
Subject: Re: [cvsnt] Merging branches.

James Neave wrote:
> What does the -b switch do exactly? 

Merge from the branchpoint - re-merge everything even if it has been 
merged before.  You'll probably get a lot of conflicts that way... 
doesn't really scale with large projects.

> And how come not using still merges some stuff but not everything?

It won't merge anything that has previously been merged.

Tony
_______________________________________________
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.