# # # patch "ChangeLog" # from [8b4a9853dd3b1c5ed73c75733d7e581be3fdf70e] # to [4267d049a202992d1272b264ff1aade7b32f6108] # # patch "roster.cc" # from [c7198e45fd020f37d1d2fa10f203bf4e9982a1bc] # to [ccbdfd50a2a99c49598ae638a013a095f232c876] # ============================================================ --- ChangeLog 8b4a9853dd3b1c5ed73c75733d7e581be3fdf70e +++ ChangeLog 4267d049a202992d1272b264ff1aade7b32f6108 @@ -1,5 +1,9 @@ 2006-02-25 Nathaniel Smith + * roster.cc (detach_node): Add missing invariant. + +2006-02-25 Nathaniel Smith + * roster_merge.cc (roster_merge): Fix strange merge-created problem... ============================================================ --- roster.cc c7198e45fd020f37d1d2fa10f203bf4e9982a1bc +++ roster.cc ccbdfd50a2a99c49598ae638a013a095f232c876 @@ -596,6 +596,7 @@ path_component basename; dirname_basename(pth, dirname, basename); + I(has_root()); if (dirname.empty()) { // detaching the root dir