On Wed, Jul 13, 2011 at 22:39, Carrot Wei <car...@google.com> wrote: > Hi Diego > > The previous patch was done with svn merge. > > This new version is done with svnmerge.py. Again tested with
Great, thanks. This simplifies regular merges, since svnmerge.py will know that this rev was merged already. I think svnmerge.py also reads 'svn merge' markers, but I'm not sure. > make check-g++ RUNTESTFLAGS="--target_board=arm-sim/thumb/arch=armv7-a > dg.exp=anon-ns1.C" > make check-g++ RUNTESTFLAGS="dg.exp=anon-ns1.C" > > BTW, there are some unexpected property changes after merge, I don't > how did they come out and how should I deal with them? Don't worry about those. The branch used to merge from multiple sources that had different attributes for those files. It will be gone after the next merge I'm doing next week. The backport is OK, of course. Diego.
