Re: [Boost-testing] git, possible redundancy in run.py

Subject: Re: [Boost-testing] git, possible redundancy in run.py
From: Niklas Angare (li51ckf02_at_[hidden])
Date: 2014-09-24 17:28:15

"Ben Pope" <benpope81_at_[hidden]> wrote:
> On Tuesday, September 23, 2014 07:30 AM, Niklas Angare wrote:
>> I don't know the answer to that, but using pull seems like a bad idea to
>> me. What pull does is fetch and then merge remote commits with local.
>> But there should never be local commits in the tester repositories. And
>> if there are, they should never be merged as that would cause the tests
>> to silently run with those local commits.
>
> Oh, it does a git reset --hard; git clean -fxd afterwards, but sure, the 
> merge part of pull seems unnecessary.

By local changes, I meant local commits. I've corrected the quoted text 
above.

> It looks like the current commands might be in the wrong order (should we 
> reset and clean before fetch/pull?)

Absolutely. Doing pull before reset is what causes the failure with 
patch_boost I mentioned.

> I'm a git newbie, and the manual is insanity itself, so I'm struggling to 
> ascertain the correct sequence.

Git and its manual are definitely not user friendly.

Regards,

Niklas Angare