Show More
@@ -380,7 +380,7 b' def overridemanifestmerge(origfn, repo, ' | |||||
380 | for action in actions: |
|
380 | for action in actions: | |
381 | f, m, args, msg = action |
|
381 | f, m, args, msg = action | |
382 |
|
382 | |||
383 | splitstandin = lfutil.splitstandin(f) |
|
383 | splitstandin = f and lfutil.splitstandin(f) | |
384 | if (m == "g" and splitstandin is not None and |
|
384 | if (m == "g" and splitstandin is not None and | |
385 | splitstandin in p1 and splitstandin not in removes): |
|
385 | splitstandin in p1 and splitstandin not in removes): | |
386 | # Case 1: normal file in the working copy, largefile in |
|
386 | # Case 1: normal file in the working copy, largefile in |
@@ -2192,6 +2192,39 b' check messages when there are files to u' | |||||
2192 |
|
2192 | |||
2193 | $ cd .. |
|
2193 | $ cd .. | |
2194 |
|
2194 | |||
|
2195 | merge action 'd' for 'local renamed directory to d2/g' which has no filename | |||
|
2196 | ||||
|
2197 | $ hg init merge-action | |||
|
2198 | $ cd merge-action | |||
|
2199 | $ touch l | |||
|
2200 | $ hg add --large l | |||
|
2201 | $ mkdir d1 | |||
|
2202 | $ touch d1/f | |||
|
2203 | $ hg ci -Aqm0 | |||
|
2204 | Invoking status precommit hook | |||
|
2205 | A d1/f | |||
|
2206 | A l | |||
|
2207 | $ echo > d1/f | |||
|
2208 | $ touch d1/g | |||
|
2209 | $ hg ci -Aqm1 | |||
|
2210 | Invoking status precommit hook | |||
|
2211 | M d1/f | |||
|
2212 | A d1/g | |||
|
2213 | $ hg up -qr0 | |||
|
2214 | $ hg mv d1 d2 | |||
|
2215 | moving d1/f to d2/f (glob) | |||
|
2216 | $ hg ci -qm2 | |||
|
2217 | Invoking status precommit hook | |||
|
2218 | A d2/f | |||
|
2219 | R d1/f | |||
|
2220 | $ hg merge | |||
|
2221 | merging d2/f and d1/f to d2/f | |||
|
2222 | 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | |||
|
2223 | (branch merge, don't forget to commit) | |||
|
2224 | getting changed largefiles | |||
|
2225 | 0 largefiles updated, 0 removed | |||
|
2226 | $ cd .. | |||
|
2227 | ||||
2195 | Check whether "largefiles" feature is supported only in repositories |
|
2228 | Check whether "largefiles" feature is supported only in repositories | |
2196 | enabling largefiles extension. |
|
2229 | enabling largefiles extension. | |
2197 |
|
2230 |
General Comments 0
You need to be logged in to leave comments.
Login now