Hi Robin,
I removed those three files from the tree a few hours ago. Chances are you
just need to delete them manually from each working directory and then the
git pull will run and subsequently automatically add them and then remove
them.
All the best
Ross
On 1/10/14, 7:11 PM, "Robin Betz" <rbetz.ucsd.edu> wrote:
>Hi all,
>
>The easiest way to get a branch tracked by cruise control is to send me an
>email with the branch name-- I have some scripts that can add the build
>targets almost immediately.
>
>Cruise control has not been able to build and test the latest commits
>because a 'git pull' is failing due to local changes being made to the
>following files:
>
>src/emil/Makefile
>src/emil/aclocal.m4
>src/emil/libtool
>
>It looks like the files are automatically generated by automake during the
>build and therefore probably should not be committed into the tree as
>their
>contents can vary depending on the automake version and installation
>directory. Cruise control has automake 1.11.1, which is up to date with
>the
>Red Hat repositories.
>
>I am checking out those files again for each build and will have it
>automatically check out a clean version of the git tree at the start of
>each build from now on so this problem doesn't happen again.
>
>Robin
>
>
>
>On Fri, Jan 10, 2014 at 6:37 PM, Ross Walker <ross.rosswalker.co.uk>
>wrote:
>
>> Hi Dave,
>>
>> I'll defer to Robin Betz on the Cruise control since she is the keeper
>>of
>> this machine. Robin any chance you can provide Dave and myself with some
>> instructions on how to add (and remove) branches from the cruise control
>> testing.
>>
>> All the best
>> Ross
>>
>>
>> On 1/10/14, 6:20 PM, "David A Case" <case.biomaps.rutgers.edu> wrote:
>>
>> >On Fri, Jan 10, 2014, Ross Walker wrote:
>> >>
>> >> 1) What is EMIL?
>> >> 2) Was it tested before committing?
>> >
>> >Can you post instructions on how to get a branch tested by
>>CruiseControl?
>> >The emil code required automake (should not have); it worked on a
>>number
>> >of machines, all of which happened to have useful versions of
>>autotools,
>> >but having the ability to run Cruise Control on a branch (as you or
>> >someone has been doing with gpu-tachyon) would probably help catch such
>> >problems.
>> >
>> >Also, to everyone: please be sure to do the following:
>> >
>> > git diff --stat origin/master
>> >
>> >immediately before a "git push" to master. Make sure the diffs you see
>> >are
>> >the ones that you expect.
>> >
>> >...thx...dac
>> >
>> >
>> >_______________________________________________
>> >AMBER-Developers mailing list
>> >AMBER-Developers.ambermd.org
>> >http://lists.ambermd.org/mailman/listinfo/amber-developers
>>
>>
>>
>> _______________________________________________
>> AMBER-Developers mailing list
>> AMBER-Developers.ambermd.org
>> http://lists.ambermd.org/mailman/listinfo/amber-developers
>>
>_______________________________________________
>AMBER-Developers mailing list
>AMBER-Developers.ambermd.org
>http://lists.ambermd.org/mailman/listinfo/amber-developers
_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Fri Jan 10 2014 - 20:00:03 PST
