Show More
@@ -516,7 +516,7 b' def diff(repo, node1=None, node2=None, f' | |||||
516 | src = repo.dirstate.copied(f) |
|
516 | src = repo.dirstate.copied(f) | |
517 | parent = repo.dirstate.parents()[0] |
|
517 | parent = repo.dirstate.parents()[0] | |
518 | if src: |
|
518 | if src: | |
519 |
f = src |
|
519 | f = src | |
520 | of = renamedbetween(f, node1, parent) |
|
520 | of = renamedbetween(f, node1, parent) | |
521 | if of: |
|
521 | if of: | |
522 | return of |
|
522 | return of |
@@ -94,3 +94,21 b' echo' | |||||
94 | echo '% file created after r1 and renamed before r2' |
|
94 | echo '% file created after r1 and renamed before r2' | |
95 | hg diff --git -r -5:-1 |
|
95 | hg diff --git -r -5:-1 | |
96 |
|
96 | |||
|
97 | echo | |||
|
98 | echo '% comparing with the working dir' | |||
|
99 | echo >> start | |||
|
100 | hg ci -m 'change start again' -d '0 0' | |||
|
101 | ||||
|
102 | echo > created | |||
|
103 | hg add created | |||
|
104 | hg ci -m 'add created' | |||
|
105 | ||||
|
106 | hg mv created created2 | |||
|
107 | hg ci -m 'mv created created2' | |||
|
108 | ||||
|
109 | hg mv created2 created3 | |||
|
110 | echo "% there's a copy in the working dir..." | |||
|
111 | hg diff --git | |||
|
112 | echo | |||
|
113 | echo "% ...but there's another copy between the original rev and the wd" | |||
|
114 | hg diff --git -r -2 |
@@ -102,3 +102,14 b' new file mode 100644' | |||||
102 | +a |
|
102 | +a | |
103 | +b |
|
103 | +b | |
104 | +c |
|
104 | +c | |
|
105 | ||||
|
106 | % comparing with the working dir | |||
|
107 | % there's a copy in the working dir... | |||
|
108 | diff --git a/created2 b/created3 | |||
|
109 | rename from created2 | |||
|
110 | rename to created3 | |||
|
111 | ||||
|
112 | % ...but there's another copy between the original rev and the wd | |||
|
113 | diff --git a/created b/created3 | |||
|
114 | rename from created | |||
|
115 | rename to created3 |
General Comments 0
You need to be logged in to leave comments.
Login now