# # # patch "ChangeLog" # from [93719def6d0a8bd5cac81d2e420be68c47346104] # to [11861ee0573028619abf42d20f8039fd4952777e] # # patch "work.cc" # from [b4171faaeb9ba3d7602ff6e36b36e212eb746136] # to [c6c7f67690fe5d7d7d5ae2bb8ff0e89ecae51341] # ============================================================ --- ChangeLog 93719def6d0a8bd5cac81d2e420be68c47346104 +++ ChangeLog 11861ee0573028619abf42d20f8039fd4952777e @@ -1,3 +1,8 @@ +2006-10-31 Nathaniel Smith + + * work.cc (perform_rename): Tweak error message that just annoyed + me. + 2006-10-26 Richard Levitte * tests/disapproving_with_message/__driver__.lua (r_sha): New ============================================================ --- work.cc b4171faaeb9ba3d7602ff6e36b36e212eb746136 +++ work.cc c6c7f67690fe5d7d7d5ae2bb8ff0e89ecae51341 @@ -1184,7 +1184,7 @@ workspace::perform_rename(set { // "rename SRC1 SRC2 DST" case N(new_roster.has_node(dst), - F("destination dir %s/ does not exist in current revision") % dst_path); + F("destination dir %s/ is not versioned (perhaps add it?)") % dst_path); N(is_dir_t(new_roster.get_node(dst)), F("destination %s is an existing file in current revision") % dst_path);