# # # patch "ChangeLog" # from [1da0b909bd2cdfcf8af52a8815f23bbfb8fccfb3] # to [1a0857e811941b6c99cd776c503b42b3b2f47b90] # # patch "work.cc" # from [84255ab5fc196afa22837bc1109dce8f2d8fd549] # to [a699ba94211d1373eee63d2142479da476ac6996] # ============================================================ --- ChangeLog 1da0b909bd2cdfcf8af52a8815f23bbfb8fccfb3 +++ ChangeLog 1a0857e811941b6c99cd776c503b42b3b2f47b90 @@ -1,5 +1,9 @@ 2006-02-21 Nathaniel Smith + * work.cc (detach_node): Oops, x != y != !(x == y). + +2006-02-21 Nathaniel Smith + * work.cc (detach_node): Check if we are passed the root dir, and error out if so. ============================================================ --- work.cc 84255ab5fc196afa22837bc1109dce8f2d8fd549 +++ work.cc a699ba94211d1373eee63d2142479da476ac6996 @@ -755,7 +755,7 @@ node_id nid = next_nid++; file_path src_pth(src); // can't detach the root dir - E(src != file_path(), F("cannot delete or rename the root directory")); + E(!(src == file_path()), F("cannot delete or rename the root directory")); bookkeeping_path dst_pth = path_for_nid(nid); safe_insert(rename_add_drop_map, make_pair(dst_pth, src_pth)); make_dir_for(dst_pth);