[Nut-upsdev] git conversion progress

Eric S. Raymond esr at thyrsus.com
Mon Jan 23 15:15:29 UTC 2012


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.

Current state, as usual, at

   git at gitorious.org:reposurgeon/reposurgeon.git
   git at gitorious.org:reposurgeon/nut-conversion.git

I made sure to push both this time.
-- 
		<a href="http://www.catb.org/~esr/">Eric S. Raymond</a>



More information about the Nut-upsdev mailing list