Re: a review of the merge (Re: Emacs.app merged)

[Stefan Monnier]

> Sorry about this.  The way I did the merge was:

> 1) Merge from trunk in bzr on 7/14
> 2) Do a CVS checkout around the same time
> 3) Copy needed files from bzr tree to CVS tree on 7/15

*Never* copy files like this.  Instead, extract a patch from one tree
and apply it to the other.  Otherwise you risk losing changes.
This is true of any work with branches and things like that: nothing
specific to Emacs at all.


        Stefan