|
From: | Sergei Organov |
Subject: | Re: Overwriting trunk files with specific branch files |
Date: | 17 Aug 2005 14:43:28 +0400 |
User-agent: | Gnus/5.0808 (Gnus v5.8.8) XEmacs/21.4 (Common Lisp) |
Andy Jones <address@hidden> writes: > > >cvs co -j HEAD -j t_branchA_tagA module > > Does anyone feel like explainaing how this is not a merge? I don't > get it. As far as I understand, this calculates delta that would bring HEAD to t_branchA_tagA and applies the delta to the working directory that happens to match HEAD. So the result is just t_branchA_tagA without any merge. -- Sergei.
[Prev in Thread] | Current Thread | [Next in Thread] |