Re: synchronizing emacs-unicode branch to HEAD

[Miles Bader <miles@lsi.nec.co.jp>]

Kenichi Handa <handa@m17n.org> writes:
> So, if your change depends on macros in old charset.h and coding.h,
> you must pay big attention to the change.  Otherwise, I think you
> don't have to worry about the unicode merge that much.

Cool.

> > I suppose you probably merged from HEAD too early to get my
> > arch-tagging changes; would you mind if I make that same change to
> > your CVS unicode branch?
> 
> I don't mind as far as that change doesn't make future merging of
> emacs-unicode-2 into HEAD difficult.

If I make changes to the unicode branch which I've also made to HEAD,
then there will be be redundant hunks.  In general I think CVS silently
ignores redundant changes (and the tagline changes are pretty well
isolated at the end of files), so this shouldn't cause any problems, but
I'm not entirely sure about the the specific case of `cvs update -j'
(which is what I presume you'll use to do the merge); does anyone know
for sure?

Thanks

-Miles
-- 
Next to fried food, the South has suffered most from oratory.
  			-- Walter Hines Page