monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] net.venge.monotone.issue-120: 141590e84074301c


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone.issue-120: 141590e84074301c8152b687cccf1591c99122cc
Date: Thu, 24 Feb 2011 17:30:34 +0100 (CET)

revision:            141590e84074301c8152b687cccf1591c99122cc
date:                2011-02-24T15:37:26
author:              Richard Hopkins <address@hidden>
branch:              net.venge.monotone.issue-120
changelog:
changed_nodes_summary now uses new filename for renames instead of the old
filename

All tests now pass, and the following failed during development when "mtn
ls changed" had the same output as "mtn status"

305 - listing_changed_files
421 - pivot_root
496 - reverting_a_pivot_root
598 - two_parent_workspace_list

manifest:
format_version "1"

new_manifest [526c8d330acd10849483286fa131243fc2d17be0]

old_revision [45f867b29111e83864a6bd6685d099ea96996289]

patch "src/cmd_list.cc"
 from [8abe82944d26b67c9506d12e054f8deed0a202e4]
   to [f7f1d1bff531769c362232264a7ef3e470c66052]
============================================================
--- src/cmd_list.cc	8abe82944d26b67c9506d12e054f8deed0a202e4
+++ src/cmd_list.cc	f7f1d1bff531769c362232264a7ef3e470c66052
@@ -871,7 +871,13 @@ namespace
       // our output is accumulated in output_files as we only care about the
       // unique file_path's
 
-      output_files.insert(fp_first);
+      // we output the new filename (fp_second) for renames,
+      // and the original (fp_first) for the others as they don't have a
+      // new filename
+      if (status == renamed)
+        output_files.insert(fp_second);
+      else
+        output_files.insert(fp_first);
 
       return "";
     }

reply via email to

[Prev in Thread] Current Thread [Next in Thread]