[prog] CVS travails, and strategies

[John Clarke]

On Thu, Sep 18, 2003 at 11:11:18PM +1000, Jenn Vesperman wrote:
> On Thu, 2003-09-18 at 10:48, John Clarke wrote:
> 
> > I haven't ever used '-D' with '-j' when merging a branch, but I have
> > merged branches which didn't include changes made in the head and seen
> > similar results to those that Michelle described - changes lost from
> > the head.
> 
> So have I, but only with two -js. 

I have seen it with only one '-j', which is why I'm always really
careful when merging branches :-)

> So _my_ assumption is that cvs would treat the -D as a request to
> convert the sandbox to a static sandbox with the files all as of the
> date; and NOT to perceive the -D as a part of the merge parameters. -j
> is for merge parameters.

Thanks for that, it does make more sense than what I said.  I'd
forgotten about '-j rev:date', so that's why I assumed the '-D' applied
to the branch revisions.


Cheers,

John
-- 
whois !JC774-AU at whois.aunic.net
GPG key id: 0xD59C360F
http://kirriwa.net/john/