Show More
@@ -1106,7 +1106,7 b' class queue:' | |||||
1106 | f = repo.file(dst) |
|
1106 | f = repo.file(dst) | |
1107 | src = f.renamed(man[dst]) |
|
1107 | src = f.renamed(man[dst]) | |
1108 | if src: |
|
1108 | if src: | |
1109 |
copies |
|
1109 | copies.setdefault(src[0], []).extend(copies.get(dst, [])) | |
1110 | if dst in a: |
|
1110 | if dst in a: | |
1111 | copies[src[0]].append(dst) |
|
1111 | copies[src[0]].append(dst) | |
1112 | # we can't copy a file created by the patch itself |
|
1112 | # we can't copy a file created by the patch itself |
@@ -82,3 +82,28 b' echo % patch file contents' | |||||
82 | cat .hg/patches/mqbase | \ |
|
82 | cat .hg/patches/mqbase | \ | |
83 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
|
83 | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | |
84 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" |
|
84 | -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" | |
|
85 | cd .. | |||
|
86 | ||||
|
87 | ||||
|
88 | ||||
|
89 | echo "[diff]" >> $HGRCPATH | |||
|
90 | echo "git=True" >> $HGRCPATH | |||
|
91 | ||||
|
92 | # Test qrefresh --git losing copy metadata | |||
|
93 | echo % create test repo | |||
|
94 | hg init repo | |||
|
95 | cd repo | |||
|
96 | echo a > a | |||
|
97 | hg ci -Am adda | |||
|
98 | hg copy a ab | |||
|
99 | echo b >> ab | |||
|
100 | hg copy a ac | |||
|
101 | echo c >> ac | |||
|
102 | echo % capture changes | |||
|
103 | hg qnew -f p1 | |||
|
104 | hg qdiff | |||
|
105 | echo % refresh and check changes again | |||
|
106 | hg qref | |||
|
107 | hg qdiff | |||
|
108 | cd .. | |||
|
109 |
@@ -159,3 +159,39 b' diff -r b55ecdccb5cf 2/base' | |||||
159 | @@ -1,1 +1,1 @@ |
|
159 | @@ -1,1 +1,1 @@ | |
160 | -base |
|
160 | -base | |
161 | +patched |
|
161 | +patched | |
|
162 | % create test repo | |||
|
163 | adding a | |||
|
164 | % capture changes | |||
|
165 | diff --git a/a b/ab | |||
|
166 | copy from a | |||
|
167 | copy to ab | |||
|
168 | --- a/a | |||
|
169 | +++ b/ab | |||
|
170 | @@ -1,1 +1,2 @@ | |||
|
171 | a | |||
|
172 | +b | |||
|
173 | diff --git a/a b/ac | |||
|
174 | copy from a | |||
|
175 | copy to ac | |||
|
176 | --- a/a | |||
|
177 | +++ b/ac | |||
|
178 | @@ -1,1 +1,2 @@ | |||
|
179 | a | |||
|
180 | +c | |||
|
181 | % refresh and check changes again | |||
|
182 | diff --git a/a b/ab | |||
|
183 | copy from a | |||
|
184 | copy to ab | |||
|
185 | --- a/a | |||
|
186 | +++ b/ab | |||
|
187 | @@ -1,1 +1,2 @@ | |||
|
188 | a | |||
|
189 | +b | |||
|
190 | diff --git a/a b/ac | |||
|
191 | copy from a | |||
|
192 | copy to ac | |||
|
193 | --- a/a | |||
|
194 | +++ b/ac | |||
|
195 | @@ -1,1 +1,2 @@ | |||
|
196 | a | |||
|
197 | +c |
General Comments 0
You need to be logged in to leave comments.
Login now