[Nut-upsdev] git conversion progress

[Charles Lepple]

On Jan 23, 2012, at 10:15 AM, Eric S. Raymond wrote:

> Charles Lepple <clepple at gmail.com>:
>> The odd part is that on the Augeas branch itself (including after a
>> trunk-to-Augeas merge), the files seem correct. After the
>> Augeas-to-trunk merge, though, files such as
>> scripts/augeas/nuthostsconf.aug.in revert back to their earlier
>> state on the Augeas branch.
> 
> Once again this was an odd case in the metadata that was triggered
> nowhere else - in this case, by an svn copy of a non-branch directory.
> 
> The problem was easily solved. My branch detection predicate needed a
> conjunct it didn't have.


Hmm, I still see the wrong content in the final scripts/augeas/*.aug.in, although the merge from Augeas into the trunk is not indicated. (That merge point on the last pass was correct, IMHO - but the final merged *.aug.in files should have @CONFPATH@ instead of /etc/nut after the trunk merge - see my previous email.) Tested with commit c023d35 to reposurgeon.

-- 
Charles Lepple
clepple at gmail