On Jul 28 15:01, Nate Straz wrote: > On Jul 28 09:17, Garrett Cooper wrote: > > I'm new to git so I'm not sure what the best means of doing a merge > > is and it appears to have found a lot of unnecessary changes in > > testcases/open_hpi_testsuite, which has bloated the diff a lot (again). > > I think the approach I'm going to take is to disect the big patch into > smaller chuncks which we can merge bit by bit. As it stands your patch > looks like this: > > [EMAIL PROTECTED] ltp]$ git diff HEAD^ --shortstat > 5497 files changed, 5353 insertions(+), 645242 deletions(-)
That insertion number didn't look right and I found what I did wrong. I didn't specify "--index" on my git-apply so it didn't add any of the new files. This is the correct summary of the patch: 6109 files changed, 25452 insertions(+), 645242 deletions(-) > Whatever we can move out of the tree to make the Makefile changes > easier, the better. It looks like you remove a lot of ballista open_hpi_testsuite, and open_posix_testsuite. Was that intended? Nate ------------------------------------------------------------------------- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK & win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100&url=/ _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
