On Jan 20, 2012, at 8:21 AM, Charles Lepple wrote:

> Agreed, the topology is looking very good.

I may have spoken too soon. Some of the branches are subtly wrong.

In particular, the apparmor branch was created from the trunk, not windows_port.

Also, the history of the tl_usb_fbsd branch is not terribly important, but it 
also has a "merge bubble" at the "Working on uhid driver again" commit.

> I won't have time to go over the files themselves (or to find additional 
> merge points) until this weekend, but this merge hasn't been discovered 
> automatically in the latest conversion:
> 
>> apcsmart-dev -> trunk: merged in SVN r3211
>> (2011-09-12T13:54:[email protected])
>> - trunk parent: r3206 (2011-09-12T02:15:[email protected])
>> - branch parent: r3210 
>> (2011-09-12T13:04:[email protected])
> 
> (from commit c7c43e69 in nut-conversion, and c3144b2 in reposurgeon)

-- 
Charles Lepple
clepple@gmail




_______________________________________________
Nut-upsdev mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/nut-upsdev

Reply via email to