Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-git-export @ 3696:562a65635bcb
diff: better detection of renames when comparing with the working dir.
| author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
|---|---|
| date | Mon, 20 Nov 2006 19:32:38 -0200 |
| parents | 3a2fc90d27d6 |
| children | 70c3ee224c08 |
comparison
equal
deleted
inserted
replaced
| 3695:3a2fc90d27d6 | 3696:562a65635bcb |
|---|---|
| 110 echo "% there's a copy in the working dir..." | 110 echo "% there's a copy in the working dir..." |
| 111 hg diff --git | 111 hg diff --git |
| 112 echo | 112 echo |
| 113 echo "% ...but there's another copy between the original rev and the wd" | 113 echo "% ...but there's another copy between the original rev and the wd" |
| 114 hg diff --git -r -2 | 114 hg diff --git -r -2 |
| 115 echo | |
| 116 echo "% ...but the source of the copy was created after the original rev" | |
| 117 hg diff --git -r -3 | |
| 118 hg ci -m 'mv created2 created3' | |
| 119 | |
| 120 echo > brand-new | |
| 121 hg add brand-new | |
| 122 hg ci -m 'add brand-new' | |
| 123 hg mv brand-new brand-new2 | |
| 124 echo '% created in parent of wd; renamed in the wd' | |
| 125 hg diff --git | |
| 126 | |
| 127 echo | |
| 128 echo '% created between r1 and parent of wd; renamed in the wd' | |
| 129 hg diff --git -r -2 |