<div class="gmail_quote">On Fri, Jun 17, 2011 at 6:46 AM, Esztermann, Ansgar <span dir="ltr"><<a href="mailto:Ansgar.Esztermann@mpi-bpc.mpg.de">Ansgar.Esztermann@mpi-bpc.mpg.de</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Hi everyone,<br>
<br>
some time ago, I've set up automated nightly builds of an open-source project (with CTest and CDash). CTest support isn't in upstream, so I have created a "ctest" branch in git, pulling every night from upstream. A while ago, I noticed that all my test were gone -- indeed, the whole branch and its history were gone.<br>
Some investigation revealed that CTest does this on purpose (fetch and reset --hard instead of pull or fetch and merge) so "that the upstream branch is tested as expected."<br>
<br>
Is it possible to test a local branch? How would I do that?<br>
<br>
<br>
Thanks a lot,<br>
<br>
A.<br>
<br>
--<br>
Ansgar Esztermann<br>
DV-Systemadministration<br>
Max-Planck-Institut für biophysikalische Chemie, Abteilung 105<br>
_______________________________________________<br>
Powered by <a href="http://www.kitware.com" target="_blank">www.kitware.com</a><br>
<br>
Visit other Kitware open-source projects at <a href="http://www.kitware.com/opensource/opensource.html" target="_blank">http://www.kitware.com/opensource/opensource.html</a><br>
<br>
Please keep messages on-topic and check the CMake FAQ at: <a href="http://www.cmake.org/Wiki/CMake_FAQ" target="_blank">http://www.cmake.org/Wiki/CMake_FAQ</a><br>
<br>
Follow this link to subscribe/unsubscribe:<br>
<a href="http://www.cmake.org/mailman/listinfo/cmake" target="_blank">http://www.cmake.org/mailman/listinfo/cmake</a><br>
</blockquote></div><br><br>If you have local-only modifications to a CMake checkout, they will be lost if you use ctest_update to update it from our main repo. ctest_update does that intentionally, as you've noted.<br>
<br>If you want to keep your local-only modifications, simply do not use ctest_update to get the upstream changes. Write your own script, or sequence of execute_process git calls to retrieve them and then merge or re-base your local mods as you wish instead.<br>
<br>Does that make sense?<br><br>If you have further questions, a pointer to the script you're using and a description of your local mods might help us to answer them better.<br><br>HTH,<br>David<br><br>