Show More
@@ -200,6 +200,8 b' def manifestmerge(repo, wctx, p2, pa, br' | |||
|
200 | 200 | pa = wctx |
|
201 | 201 | elif pa == p2: # backwards |
|
202 | 202 | pa = wctx.p1() |
|
203 | elif not branchmerge and not wctx.dirty(missing=True): | |
|
204 | pass | |
|
203 | 205 | elif pa and repo.ui.configbool("merge", "followcopies", True): |
|
204 | 206 | ret = copies.mergecopies(repo, wctx, p2, pa) |
|
205 | 207 | copy, movewithdir, diverge, renamedelete = ret |
@@ -210,7 +210,6 b' merge tests' | |||
|
210 | 210 | subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
211 | 211 | subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
|
212 | 212 | getting subrepo t |
|
213 | searching for copies back to rev 1 | |
|
214 | 213 | resolving manifests |
|
215 | 214 | branchmerge: False, force: False, partial: False |
|
216 | 215 | ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a |
General Comments 0
You need to be logged in to leave comments.
Login now