Mercurial > hg
comparison tests/test-mq-merge.t @ 15775:91eb4512edd0
copies: rewrite copy detection for non-merge users
The existing copy detection API was designed with merge in mind and
was ill-suited for doing status/diff. The new pathcopies
implementation gives more accurate, easier to use results for
comparing two revisions, and is much simpler to understand.
Test notes:
- test-mv-cp-st.t results finds more renames in the reverse direction now
- test-mq-merge.t was always wrong and duplicated a copy in diff that
was already present in one of the parent revisions
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Wed, 04 Jan 2012 17:55:30 -0600 |
| parents | 9910f60a37ee |
| children | 0e0060bf2f44 |
comparison
equal
deleted
inserted
replaced
| 15774:0bd17a4bed88 | 15775:91eb4512edd0 |
|---|---|
| 147 +++ b/a | 147 +++ b/a |
| 148 @@ -1,1 +1,2 @@ | 148 @@ -1,1 +1,2 @@ |
| 149 -b | 149 -b |
| 150 +a | 150 +a |
| 151 +c | 151 +c |
| 152 diff --git a/a b/aa | 152 diff --git a/aa b/aa |
| 153 copy from a | 153 new file mode 100644 |
| 154 copy to aa | 154 --- /dev/null |
| 155 --- a/a | |
| 156 +++ b/aa | 155 +++ b/aa |
| 157 @@ -1,1 +1,1 @@ | 156 @@ -0,0 +1,1 @@ |
| 158 -b | |
| 159 +a | 157 +a |
| 160 | 158 |
| 161 Check patcha2 is still a regular patch: | 159 Check patcha2 is still a regular patch: |
| 162 | 160 |
| 163 $ cat .hg/patches/patcha2 | 161 $ cat .hg/patches/patcha2 |