Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.
Sorry, I wasn't very clear :-( What I mean is that 'update -j' behaviour differs from 'update'. With 'upate -j' binary files indeed _are_ being patched just like text files. Regards, Flávio On 11/26/05, Tony Hoyle <tony.hoyle at march-hare.com> wrote: > Flávio Etrusco wrote: > > Hi, > > To end my round of complaints/reports regarding merging of branches, > > another odd thing I've noticed (since at least 2.5.01 AFAIR) is > > 'update -j' is merging binary files - either kb, kB or kBz. > > It's no big deal, but I thought I should let you know ;-) > > > There's nothing special about binary files in the merge process. > They'll conflict if the files are different (possibly even if they are > different version numbers), since they can't be patched. > > Tony