--ZPt4rx8FFjLCG7dd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Sep 16, 2007 at 09:59:05AM +0100, David Laight wrote:
> On Sun, Sep 16, 2007 at 02:48:21AM +0200, Joerg Sonnenberger wrote:
> > On Sat, Sep 15, 2007 at 11:05:48PM +0100, David Laight wrote:
> > > On Sat, Sep 08, 2007 at 03:44:57PM +0000, Joerg Sonnenberger wrote:
> > > >=20
> > > > Module Name:	src
> > > > Committed By:	joerg
> > > > Date:		Sat Sep  8 15:44:57 UTC 2007
> > > >=20
> > > > Modified Files:
> > > > 	src/sys/arch/x86/x86 [jmcneill-pm]: cpu.c
> > > >=20
> > > > Log Message:
> > > > ANSIfy before further changes.
> > >=20
> > > Is this a good idea on a branch?
> > > When the branch is merged the branch-specific changes won't be visible
> > > - unless the same ANSIfication is done to HEAD separately.
> >=20
> > I asked Andrew whether he has changes in this area so I don't expect
> > this to be a problem.
>=20
> I wasn't thinking about problems merging other branches, but about the
> visibility of the actual changes in your branch.
>=20
> It would probably be best to ansify head, and pullup that chagne into
> your branch. Then, when your branch is merged, the change to head is
> only the significant changes, not all the mechanical ones.

Actually applying the ansification to the head and adjusting the branch=20
base (i.e. re-syncing w/ HEAD) will achive the same effect.

Take care,

Bill

--ZPt4rx8FFjLCG7dd
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (NetBSD)

iD8DBQFG7tL8Wz+3JHUci9cRAqaXAJ9cAc4reXm4WAOjzciLLD/B33Q7DQCfR3Gs
erKSI+OWlwRXQNTLDXAkyHY=
=G2a4
-----END PGP SIGNATURE-----

--ZPt4rx8FFjLCG7dd--