Re: [Monotone-devel] Re: (minor) BSD build issues...
On 27/08/2007, at 2:13 AM, Lapo Luchini wrote: William Uther wrote: ii) The BSD buildbots are failing the refiner_various_counts unit test. It looks like an out of memory error. Are these build bots ulimited? Yes they are, using softlimit -d25600. From man softlimit: -d n Limit the data segment per process to n bytes. Is much more needed with latest changes? On the i386 I could think about increasing it, but on the amd64 one it would be a problem. I don't understand why they'd need even that much. The test that is failing can be run manually by running: ./unit_tester refiner:various_counts I did that on my machine and looked at top while it was running. It got up to 100Mb (the entire process, executable, libraries and data). So your 256Mb for data alone should be plenty. (I just tried running the test with ulimit -d 256000 on my box and it works ok...) I don't suppose you have something like time -l that you could use? You might need to specify /usr/bin/time so you don't get the shell builtin. That should return the high-water mark of memory usage for you. Be well, Will :-} ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Makefile problem; check-local?
I'm getting an error from the top level Makefile. I'm running on Win32 MinGW. make check /usr/bin/make check-recursive ... make[3]: `tester.exe' is up to date. make[3]: Leaving directory `/c/Gnu/monotone-build_mingw' /usr/bin/make check-local make[3]: Entering directory `/c/Gnu/monotone-build_mingw' make[3]: *** No rule to make target `tester_tests.status', needed by `check-local'. Stop. make[3]: Leaving directory `/c/Gnu/monotone-build_mingw' make[2]: *** [check-am] Error 2 make[2]: Leaving directory `/c/Gnu/monotone-build_mingw' make[1]: *** [check-recursive] Error 1 make[1]: Leaving directory `/c/Gnu/monotone-build_mingw' make: *** [check] Error 2 I don't see a `check-local' target in monotone-build_mingw/Makefile, nor a 'tester_tests.status', so I'm lost. Usually I can figure out Makefiles, but this one has me stumped. Any pointers? -- -- Stephe ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Makefile problem; check-local?
On 8/28/07, Stephen Leake [EMAIL PROTECTED] wrote: make[3]: *** No rule to make target `tester_tests.status', needed by `check-local'. Stop. I don't see a `check-local' target in monotone-build_mingw/Makefile, nor a 'tester_tests.status', so I'm lost. Usually I can figure out Makefiles, but this one has me stumped. Any pointers? There is a fair amount of black magic going on. There *should* be a check-local target, but the tester_tests.status target is coming from a 'pattern rule'. It won't work with anything but GNU Make. You should see something like this in the Makefile: # testsuite stuff (could this possibly be more ugly?) To get # parallelism, we cannot use Automake's TESTS feature at all. The # shell script embedded in the 'check-local' rule is partially # borrowed from automake 1.9's check.am check-local: tester_tests.status unit_tests.status lua_tests.status @all=0; failed=0; error=0; \ and later # The leading + causes Make to treat this as a recursive invocation, # allowing it to participate in the jobserver protocol. %_tests.status: run_%_tests %-testsuite.lua tester FORCE +./run_$*_tests If you do not have these things, you need to run autoreconf -i in the source tree, wipe out your build tree and re-configure it. Failing that, what version of what implementation of Make are you using? Those look like GNU Make diagnostics, but you might well have an old buggy version. zw ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Adding the same file on two branches
I've run into a problem that will probably create a non-content conflict and hope someone can suggest a work-around. I am working on two projects, A and B, where project B has branched off from project A. I would like to propagate changes from project A to project B, and have done so several times. So far, so good. In project B, I added a few new files (eg. x.c and x.h), and now would like to add the same files to project A. In effect, I'd like to propagate only those two files only from B to A. However, if I just add these files to A, I will get a non-content conflict the next time I attempt to propagate from A to B. In the graph below, assume the new files were added at B1, and I'd now like to add the files to A4. Note that the arrow from A3 to B2 is one of many propagates that have already occured and that there are many intermediate revisions not included in the following graph. A1 | \ | \ A2 B1 | | A3--B2 | | A4 B3 I'd like to know if there is a way to add the files x.c and x.h to revision A4 such that monotone will consider the files to be the same in both branches. Or, can the unique file id (birth mark or what ever it is called) be set/modified on the new files so they will appear to be the same as the original file. Thanks in advance, Patrick ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
[Monotone-devel] Ubuntu 6.06
Dear Monotone developers Is there a debian package for Ubuntu 6.06? This is the LTS version and is what our servers use. thanks tasdev ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Ubuntu 6.06
dtempw [EMAIL PROTECTED] writes: Dear Monotone developers Is there a debian package for Ubuntu 6.06? This is the LTS version and is what our servers use. There is a Debian package, yes, and there has been one since 2004 or so. I believe Ubuntu contains it, but I have no idea what version or in what section. What does apt-cache search monotone tell you? -- Ludovic Brenta. ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
Re: [Monotone-devel] Adding the same file on two branches
On Fri, 2007-08-24 at 10:47 -0400, Patrick Maheral wrote: I've run into a problem that will probably create a non-content conflict and hope someone can suggest a work-around. I am working on two projects, A and B, where project B has branched off from project A. I would like to propagate changes from project A to project B, and have done so several times. So far, so good. In project B, I added a few new files (eg. x.c and x.h), and now would like to add the same files to project A. In effect, I'd like to propagate only those two files only from B to A. However, if I just add these files to A, I will get a non-content conflict the next time I attempt to propagate from A to B. In the graph below, assume the new files were added at B1, and I'd now like to add the files to A4. Note that the arrow from A3 to B2 is one of many propagates that have already occured and that there are many intermediate revisions not included in the following graph. A1 | \ | \ A2 B1 | | A3--B2 | | A4 B3 I'd like to know if there is a way to add the files x.c and x.h to revision A4 such that monotone will consider the files to be the same in both branches. Or, can the unique file id (birth mark or what ever it is called) be set/modified on the new files so they will appear to be the same as the original file. This is not currently possible. We'd like to make it possible, but aren't sure of the right way to do it yet. You'll have to either drop or rename the files in B before you can propagate in new versions from A. -- Timothy Free (experimental) public monotone hosting: http://mtn-host.prjek.net ___ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
