Re: FW: CVS update issue using -j to merge files between a branch and

2004-05-25 Thread Larry Jones
Hamid Ghassemi writes: > > I know *why* this happens, but I don't agree with it. There was no diff > between the branch and the branch point on the trunk, so no change was > considered for the merge. At least that's how I understand it based on > how it behaves. Exactly. Merge works by conside

FW: CVS update issue using -j to merge files between a branch and the trunk

2004-05-24 Thread Hamid Ghassemi
This was sent by a co-worker of mine on May 6th. However for some reason it did not get to the mailing list. So I am sending this again. Hamid Ghassemi -Original Message- From: Joe Reifel ([EMAIL PROTECTED]) Sent: Thursday, May 06, 2004 12:21 PM To: '[EMAIL PROTECTED]' Subject: CVS upd