Hi! > *facepalm* git and I really don't get along. I tried to merge the > change from ltp-broom, that pulled in a bunch of stuff I didn't want, reset > via reset --hard, then checked out the one file from ltp-broom, which worked, > and when I pushed everything -- it pushed all of my changes from ltp-broom > back to master. So I suppose the question now is to continue with things > as-is, or revert the commit. I'm guessing folks will want the latter, but I'm > unfamiliar enough with merging and reverting with git because it's user > friendliness that I'm concerned about doing more harm than good trying to fix > things.
Just now we need to get git to some sane state so that patches created against latest git could be merged later. But I'm not sure if reseting back is better than fixing the problems created by merge. If all the problems are created by merging files that were changed in both master and ltp-broom then IMHO fixing these would be better way to go. FYI: just now compilation dies with: gcc -L../../../../lib test_arch.o -o test_arch_debug test_arch.o: In function `main': /home/metan/Work/git/ltp-dev/testcases/commands/ade/objdump/test_arch.c:17: undefined reference to `tst_exit' collect2: ld returned 1 exit status make[4]: *** [test_arch_debug] Error 1 make[4]: Leaving directory `/home/metan/Work/git/ltp-dev/testcases/commands/ade/objdump' make[3]: *** [all] Error 2 make[3]: Leaving directory `/home/metan/Work/git/ltp-dev/testcases/commands/ade' make[2]: *** [all] Error 2 make[2]: Leaving directory `/home/metan/Work/git/ltp-dev/testcases/commands' make[1]: *** [all] Error 2 make[1]: Leaving directory `/home/metan/Work/git/ltp-dev/testcases' make: *** [testcases-all] Error 2 > I need to go back home (where I don't have internet via my laptop right > now and won't for the next couple of days), but I'll continue to work on > verifying everything and fix regressions if and when I find them, and I'll > try to pop over to work whenever possible to push code back to the git repo. I hope that lack of the internet connection in your home is only temporary, as so far you did the commits and there is a already some backlog of waiting patches. I know that it's holidays now but I'm allready starting to lose track of the issues waiting for commit. If you need some help with that, don't hesitate to ask. -- Cyril Hrubis [email protected] ------------------------------------------------------------------------------ Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ Ltp-list mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ltp-list
