diff for renamed files

Patrick Mézard pmezard at gmail.com
Fri Jun 13 06:29:34 CDT 2008


Manlio Perillo a écrit :
> Hi.
> 
> Sometime I need to reorganize the files in my projects.
> However Mercurial treats renamed file as copy + delete, but this is no 

That's wrong.

> good for me, since I can't see if a file has been simply renamed or it 
> has been renamed with also some modifications.
> 
> 
> What is the best method to handle renamed files?

$ cd t
$ echo a > a
$ hg ci -Am a
adding a
$ hg mv a b
$ echo b >> b
$ hg ci -m renamed
$ hg export .
# HG changeset patch
# User Patrick Mezard <pmezard at gmail.com>
# Date 1213356391 -7200
# Node ID 42cb8e8ce34a407d89959630a20108836e37952f
# Parent  19118b350f9e2a56fc3fe4bafbea86ab1847d71f
renamed

diff --git a/a b/b
rename from a
rename to b
--- a/a
+++ b/b
@@ -1,1 +1,2 @@
 a
+b

Renames are shown in diff using the --git option (or alternatively, setting [diff] git = 1)

--
Patrick Mézard


More information about the Mercurial mailing list