Date: Mon, 4 Jan 2010 14:36:57 +0100 From: Erik Trulsson <ertr1013@student.uu.se> To: Victor Sudakov <sudakov+freebsd@sibptus.tomsk.ru> Cc: freebsd-hackers@freebsd.org Subject: Re: "Checksum mismatch -- will transfer entire file" Message-ID: <20100104133657.GA47668@owl.midgard.homeip.net> In-Reply-To: <20100104130315.GA79633@admin.sibptus.tomsk.ru> References: <20091231033244.GA5631@admin.sibptus.tomsk.ru> <4B3CC72F.9030904@andric.com> <op.u5xkb1r91e62zd@merlin.emma.line.org> <4B408745.3030309@andric.com> <20100103154503.GA63734@admin.sibptus.tomsk.ru> <20100103221655.GA76049@server.vk2pj.dyndns.org> <20100104130315.GA79633@admin.sibptus.tomsk.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jan 04, 2010 at 07:03:16PM +0600, Victor Sudakov 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. > > BTW what does cvsup (in CVS mode) do with an RCS file to which only a > branch tag has been added? How does it mirror such a change? Just > curious. It will add the tag to the file of course. (In CVS tags are stored inside each RCS file.) -- <Insert your favourite quote here.> Erik Trulsson ertr1013@student.uu.se
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100104133657.GA47668>