"Checksum mismatch -- will transfer entire file"

Victor Sudakov sudakov+freebsd at sibptus.tomsk.ru
Mon Jan 4 20:04:48 UTC 2010


Erik Trulsson wrote:
> > Peter Jeremy wrote:
> > > >I also see that many "changes" in the CVS seem to be useless: there
> > > >are no changes other than file version increments.
> > > 
> > > SVN metadata changes will appear in CVS as version changes only.  The
> > > most obvious/common case is branching - branching a native CVS repo
> > > just adds the branch tags.  Branching a SVN repo replicates the tree
> > > and the SVN->CVS exporter turns the branch into a commit that touches
> > > each affected file.
> > 
> > Thank you for the insight into theory, however the practical results
> > are annoying. For example, running mergemaster has become a nightmare.
> > It considers every file to be changed (unless you do some black magic
> > with DIFF_OPTIONS to ignore \$FreeBSD:.*\$). 
> 
> Or if you use mergemaster's -F flag which seems to exist for exactly this
> type of situation.

AFAIK it was not available before RELENG_7_2.

-- 
Victor Sudakov,  VAS4-RIPE, VAS47-RIPN
sip:sudakov at sibptus.tomsk.ru


More information about the freebsd-hackers mailing list