Show More
@@ -1555,15 +1555,16 b' def update(repo, node, branchmerge, forc' | |||
|
1555 | 1555 | pas = [p1] |
|
1556 | 1556 | |
|
1557 | 1557 | # deprecated config: merge.followcopies |
|
1558 | followcopies = False | |
|
1558 | followcopies = repo.ui.configbool('merge', 'followcopies', True) | |
|
1559 | 1559 | if overwrite: |
|
1560 | 1560 | pas = [wc] |
|
1561 | followcopies = False | |
|
1561 | 1562 | elif pas == [p2]: # backwards |
|
1562 |
pas = [ |
|
|
1563 | elif not branchmerge and not wc.dirty(missing=True): | |
|
1564 |
|
|
|
1565 | elif pas[0] and repo.ui.configbool('merge', 'followcopies', True): | |
|
1566 |
followcopies = |
|
|
1563 | pas = [p1] | |
|
1564 | elif not pas[0]: | |
|
1565 | followcopies = False | |
|
1566 | if not branchmerge and not wc.dirty(missing=True): | |
|
1567 | followcopies = False | |
|
1567 | 1568 | |
|
1568 | 1569 | ### calculate phase |
|
1569 | 1570 | actionbyfile, diverge, renamedelete = calculateupdates( |
@@ -66,7 +66,7 b' Local merge with bad merge tool:' | |||
|
66 | 66 | merging zzz1_merge_ok |
|
67 | 67 | merging zzz2_merge_bad |
|
68 | 68 | warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
|
69 |
2 files updated, 1 files merged, |
|
|
69 | 2 files updated, 1 files merged, 2 files removed, 1 files unresolved | |
|
70 | 70 | use 'hg resolve' to retry unresolved file merges |
|
71 | 71 | [1] |
|
72 | 72 | |
@@ -104,7 +104,7 b' Local merge with conflicts:' | |||
|
104 | 104 | merging zzz1_merge_ok |
|
105 | 105 | merging zzz2_merge_bad |
|
106 | 106 | warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') |
|
107 |
2 files updated, 1 files merged, |
|
|
107 | 2 files updated, 1 files merged, 2 files removed, 1 files unresolved | |
|
108 | 108 | use 'hg resolve' to retry unresolved file merges |
|
109 | 109 | [1] |
|
110 | 110 |
@@ -304,6 +304,7 b' handle subrepos safely on qrecord' | |||
|
304 | 304 | record this change to '.hgsub'? [Ynesfdaq?] y |
|
305 | 305 | |
|
306 | 306 | warning: subrepo spec file '.hgsub' not found |
|
307 | warning: subrepo spec file '.hgsub' not found | |
|
307 | 308 | abort: uncommitted changes in subrepository 'sub' |
|
308 | 309 | [255] |
|
309 | 310 | % update substate when adding .hgsub w/clean updated subrepo |
@@ -319,6 +320,7 b' handle subrepos safely on qrecord' | |||
|
319 | 320 | record this change to '.hgsub'? [Ynesfdaq?] y |
|
320 | 321 | |
|
321 | 322 | warning: subrepo spec file '.hgsub' not found |
|
323 | warning: subrepo spec file '.hgsub' not found | |
|
322 | 324 | path sub |
|
323 | 325 | source sub |
|
324 | 326 | revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 |
@@ -67,6 +67,10 b'' | |||
|
67 | 67 | summary: 2 |
|
68 | 68 | |
|
69 | 69 | $ hg --debug up 0 |
|
70 | starting 4 threads for background file closing (?) | |
|
71 | searching for copies back to rev 0 | |
|
72 | unmatched files in local (from topological common ancestor): | |
|
73 | b | |
|
70 | 74 | resolving manifests |
|
71 | 75 | branchmerge: False, force: False, partial: False |
|
72 | 76 | ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a |
@@ -222,4 +226,20 b' test a local add' | |||
|
222 | 226 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
223 | 227 | $ hg st |
|
224 | 228 | |
|
229 | test updating backwards through a rename | |
|
230 | ||
|
231 | $ hg mv a b | |
|
232 | $ hg ci -m b | |
|
233 | $ echo b > b | |
|
234 | $ hg up -q 0 | |
|
235 | $ hg st | |
|
236 | M a | |
|
237 | $ hg diff --nodates | |
|
238 | diff -r cb9a9f314b8b a | |
|
239 | --- a/a | |
|
240 | +++ b/a | |
|
241 | @@ -1,1 +1,1 @@ | |
|
242 | -a | |
|
243 | +b | |
|
244 | ||
|
225 | 245 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now