RE: Question regarding branch merges

[Fouts Christopher ()]

I've asked this before. This is design intent - you WILL have
to create the new dirs/files on the trunk onto your branch
MANUALLY!

-chris

-----Original Message-----
From: address@hidden
[mailto:address@hidden On Behalf
Of Mark Lancisi
Sent: Friday, May 14, 2004 2:02 PM
To: address@hidden
Subject: Question regarding branch merges



I've got a branch that I've been keeping in line with the HEAD of the trunk
by merging via :

cvs update -d -j <foottag> -j HEAD 

in my branch sandbox, and then committing the results and moving the foottag
on the trunk to the HEAD . 

This works great.. However - there is one issue I'm seeing.. New directories
on the trunk (and any new files in them) do not get merged into my sandbox.
New files in existing directories do, but new directories containing new
files do not.


Does anyone have any idea if this is a  design limitation or a bug in cvs?
Or am I just doing something wrong?

Thanks in  advance!

Mark Lancisi


_______________________________________________
Info-cvs mailing list
address@hidden
http://mail.gnu.org/mailman/listinfo/info-cvs