https://svn.lrde.epita.fr/svn/lrdetools/trunk Index: ChangeLog from Nicolas Pouillard &lt;ertai(a)lrde.epita.fr&gt; No more use `U' but `\'. * vcs/lib/vcs/status.rb. vcs/lib/vcs/changelog.rb, vcs/lib/vcs/diff.rb: Replace `U' by `\'. changelog.rb | 2 +- diff.rb | 2 +- status.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) Index: vcs/lib/vcs/changelog.rb --- vcs/lib/vcs/changelog.rb (revision 230) +++ vcs/lib/vcs/changelog.rb (working copy) @@ -23,7 +23,7 @@ def mkchangelog_from_status ( *args ) result = [] from_status(*args) do |line, file_st, prop_st, copy_st, file| - next if file_st =~ /[?XU,]/ + next if file_st =~ /[?X\\,]/ next if file == 'ChangeLog' ls = [] ls << @@file_st[file_st] if @@file_st.has_key? file_st Index: vcs/lib/vcs/diff.rb --- vcs/lib/vcs/diff.rb (revision 230) +++ vcs/lib/vcs/diff.rb (working copy) @@ -8,7 +8,7 @@ def diffw_from_status! ( *args ) files = Set.new from_status(*args) do |line, file_st, prop_st, cpy, file| - next if file_st =~ /[?XU,]/ + next if file_st =~ /[?X\\,]/ next if file == 'ChangeLog' files << Pathname.new(file) end Index: vcs/lib/vcs/status.rb --- vcs/lib/vcs/status.rb (revision 230) +++ vcs/lib/vcs/status.rb (working copy) @@ -16,7 +16,7 @@ # nothing ... next elsif Vcs.user_conf_global_unmask(file) - file_st = 'U' + file_st = '\\' elsif file.basename.to_s =~ /^,/ file_st = ',' end