Date: Mon, 01 Dec 2008 21:08:25 -0800 From: perryh@pluto.rain.com To: rea-fbsd@codelabs.ru, keramida@ceid.upatras.gr Cc: max@love2party.net, kientzle@freebsd.org, freebsd-hackers@freebsd.org Subject: Re: keeping track of local modifications Message-ID: <4934c2c9./%2BHbbGwhphjtaXAT%perryh@pluto.rain.com> In-Reply-To: <8S1yocfZ0YutMO/GCIC1bN8RXQ0@kjaK%2B/sQ5DW5981v71UogZJPf/0> References: <4931CB02.9070904@gmail.com> <4932E8CF.9040501@freebsd.org> <49337f04.p8QqvfzTga07ypa6%perryh@pluto.rain.com> <200812010830.17259.max@love2party.net> <gFpinjQW6hEatbsT%2BXzE0kSsZf0@kjaK%2B/sQ5DW5981v71UogZJPf/0> <874p1nlslc.fsf@kobe.laptop> <8S1yocfZ0YutMO/GCIC1bN8RXQ0@kjaK%2B/sQ5DW5981v71UogZJPf/0>
next in thread | previous in thread | raw e-mail | index | archive | help
> > Git and Mercurial cannot import Subversion $FreeBSD$ lines > > so far, and you may end up submitting patches that include > > unexpanded forms of the "$FreeBSD: xxxx $" text. These will > > fail to apply if they same patch touches nearby lines. > > Ahm, yes. "sed -e's|$FreeBSD: [^$]* \$|$FreeBSD$|g'" should help > in this case. Not sure I understand what is meant by "unexpanded" here, since it looks as if this sed example would convert an "expanded" form -- containing the version info -- to an "unexpanded" one that merely shows where that info should go. Perhaps it's my ClearCase background showing through, but I'd think it highly desirable for a patch to include what I think of as the expanded tag line -- including the version info, as it appears in the distributed files under /usr/src -- thereby explicitly showing the version on which the patch is based (the "base contributor" in ClearCase-speak). This should greatly simplify merging in the (likely) event that other development has occurred on the same file in the meantime -- provided one is using a 3-way merge tool that understands such things.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?4934c2c9./%2BHbbGwhphjtaXAT%perryh>