RE: Join is replacing?

[Guus Leeuw jr.]

> -----Original Message-----
> From: address@hidden 
> [mailto:address@hidden On Behalf 
> Of Jeeva Sarma
> Subject: Join is replacing?
> 
> I have one question. When we do a join between 2 revisions, 
> say from the branch to trunk, is it the same as replacing the 
> file on trunk with the one on branch?

A join basically merges two revisions from different branches.

If you made changes on both branches after you branched off, you are likely
to get some conflicts.
If OTOH you made changes only to the branch revision after branching, you
are most likely to replace the one on the trunk ;)
If, though, you only changed the trunk revision after branching, nothing
should be done.

Cheers,
glj

---
Outgoing mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.784 / Virus Database: 530 - Release Date: 27/10/2004