Charles Lepple <[email protected]>:
> 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.
Then we've probably got a two-point failure, with some bug or metadata
problem unrelated to the merge. I stupidly assumed that since you
were reporting content from the wrong side of the merge, filtering
out the invalid merge would do the trick. Now I suspect there's
something funky happening on the trunk side.
And it really was an invalid merge - copy of a subdirectory rather than the
entire branch. Well...semantically it was a valid merge, but one that
can't be expressed in gitspace. We may run into more of those.
I'm investigating.
--
<a href="http://www.catb.org/~esr/";>Eric S. Raymond</a>
_______________________________________________
Nut-upsdev mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/nut-upsdev
