[PATCH 11 of 11] update: enable copy tracing for backwards and non-linear updates (issue4028)
# HG changeset patch # User Gábor Stefanik# Date 1472155346 -7200 # Thu Aug 25 22:02:26 2016 +0200 # Node ID 548610449759c452d307dbcc92a9bf8fbba46140 # Parent 4b963243504357812d13fa5c824f60253e0ba448 update: enable copy tracing for backwards and non-linear updates (issue4028) diff -r 4b9632435043 -r 548610449759 mercurial/merge.py --- a/mercurial/merge.pyMon Oct 03 18:38:13 2016 +0200 +++ b/mercurial/merge.pyThu Aug 25 22:02:26 2016 +0200 @@ -1535,15 +1535,16 @@ pas = [p1] # deprecated config: merge.followcopies -followcopies = False +followcopies = repo.ui.configbool('merge', 'followcopies', True) if overwrite: pas = [wc] +followcopies = False elif pas == [p2]: # backwards -pas = [wc.p1()] -elif not branchmerge and not wc.dirty(missing=True): -pass -elif pas[0] and repo.ui.configbool('merge', 'followcopies', True): -followcopies = True +pas = [p1] +elif not pas[0]: +followcopies = False +if not branchmerge and not wc.dirty(missing=True): +followcopies = False ### calculate phase actionbyfile, diverge, renamedelete = calculateupdates( diff -r 4b9632435043 -r 548610449759 tests/test-merge-local.t --- a/tests/test-merge-local.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-merge-local.t Thu Aug 25 22:02:26 2016 +0200 @@ -66,7 +66,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') - 2 files updated, 1 files merged, 3 files removed, 1 files unresolved + 2 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] @@ -104,7 +104,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') - 2 files updated, 1 files merged, 3 files removed, 1 files unresolved + 2 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] diff -r 4b9632435043 -r 548610449759 tests/test-mq-subrepo.t --- a/tests/test-mq-subrepo.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-mq-subrepo.t Thu Aug 25 22:02:26 2016 +0200 @@ -304,6 +304,7 @@ record this change to '.hgsub'? [Ynesfdaq?] y warning: subrepo spec file '.hgsub' not found + warning: subrepo spec file '.hgsub' not found abort: uncommitted changes in subrepository 'sub' [255] % update substate when adding .hgsub w/clean updated subrepo @@ -319,6 +320,7 @@ record this change to '.hgsub'? [Ynesfdaq?] y warning: subrepo spec file '.hgsub' not found + warning: subrepo spec file '.hgsub' not found path sub source sub revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 diff -r 4b9632435043 -r 548610449759 tests/test-up-local-change.t --- a/tests/test-up-local-change.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-up-local-change.t Thu Aug 25 22:02:26 2016 +0200 @@ -67,13 +67,18 @@ summary: 2 $ hg --debug up 0 + starting 4 threads for background file closing (?) +searching for copies back to rev 0 +computing unmatched files in rotated DAG +computing unmatched files in unrotated DAG +unmatched files in local: + b resolving manifests branchmerge: False, force: False, partial: False ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a preserving a for resolve of a b: other deleted -> r removing b - starting 4 threads for background file closing (?) a: versions differ -> m (premerge) picked tool 'true' for a (binary False symlink False changedelete False) merging a ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[PATCH 11 of 11] update: enable copy tracing for backwards and non-linear updates (issue4028)
# HG changeset patch # User Gábor Stefanik# Date 1472155346 -7200 # Thu Aug 25 22:02:26 2016 +0200 # Node ID ad7e51a1e7ea3d9b0be6d90313254abd4acbcd0c # Parent 940a39a7611e80821d9684004716a7e41feb0dd1 update: enable copy tracing for backwards and non-linear updates (issue4028) diff -r 940a39a7611e -r ad7e51a1e7ea mercurial/merge.py --- a/mercurial/merge.pyMon Oct 03 18:38:13 2016 +0200 +++ b/mercurial/merge.pyThu Aug 25 22:02:26 2016 +0200 @@ -1535,15 +1535,16 @@ pas = [p1] # deprecated config: merge.followcopies -followcopies = False +followcopies = repo.ui.configbool('merge', 'followcopies', True) if overwrite: pas = [wc] +followcopies = False elif pas == [p2]: # backwards -pas = [wc.p1()] -elif not branchmerge and not wc.dirty(missing=True): -pass -elif pas[0] and repo.ui.configbool('merge', 'followcopies', True): -followcopies = True +pas = [p1] +elif not pas[0]: +followcopies = False +if not branchmerge and not wc.dirty(missing=True): +followcopies = False ### calculate phase actionbyfile, diverge, renamedelete = calculateupdates( diff -r 940a39a7611e -r ad7e51a1e7ea tests/test-merge-local.t --- a/tests/test-merge-local.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-merge-local.t Thu Aug 25 22:02:26 2016 +0200 @@ -66,7 +66,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') - 2 files updated, 1 files merged, 3 files removed, 1 files unresolved + 2 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] @@ -104,7 +104,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') - 2 files updated, 1 files merged, 3 files removed, 1 files unresolved + 2 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] diff -r 940a39a7611e -r ad7e51a1e7ea tests/test-mq-subrepo.t --- a/tests/test-mq-subrepo.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-mq-subrepo.t Thu Aug 25 22:02:26 2016 +0200 @@ -304,6 +304,7 @@ record this change to '.hgsub'? [Ynesfdaq?] y warning: subrepo spec file '.hgsub' not found + warning: subrepo spec file '.hgsub' not found abort: uncommitted changes in subrepository 'sub' [255] % update substate when adding .hgsub w/clean updated subrepo @@ -319,6 +320,7 @@ record this change to '.hgsub'? [Ynesfdaq?] y warning: subrepo spec file '.hgsub' not found + warning: subrepo spec file '.hgsub' not found path sub source sub revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 diff -r 940a39a7611e -r ad7e51a1e7ea tests/test-up-local-change.t --- a/tests/test-up-local-change.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-up-local-change.t Thu Aug 25 22:02:26 2016 +0200 @@ -67,13 +67,18 @@ summary: 2 $ hg --debug up 0 + starting 4 threads for background file closing (?) +searching for copies back to rev 0 +computing unmatched files in rotated DAG +computing unmatched files in unrotated DAG +unmatched files in local: + b resolving manifests branchmerge: False, force: False, partial: False ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a preserving a for resolve of a b: other deleted -> r removing b - starting 4 threads for background file closing (?) a: versions differ -> m (premerge) picked tool 'true' for a (binary False symlink False changedelete False) merging a ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[PATCH 11 of 11] update: enable copy tracing for backwards and non-linear updates (issue4028)
# HG changeset patch # User Gábor Stefanik# Date 1472155346 -7200 # Thu Aug 25 22:02:26 2016 +0200 # Node ID 54dc76f21006090d8b9e7f4a414e17a49f3c665e # Parent 9e59cd55604c5e30b38c66c502c8c982c01a4a01 update: enable copy tracing for backwards and non-linear updates (issue4028) diff -r 9e59cd55604c -r 54dc76f21006 mercurial/merge.py --- a/mercurial/merge.pyMon Oct 03 18:38:13 2016 +0200 +++ b/mercurial/merge.pyThu Aug 25 22:02:26 2016 +0200 @@ -1535,15 +1535,16 @@ pas = [p1] # deprecated config: merge.followcopies -followcopies = False +followcopies = repo.ui.configbool('merge', 'followcopies', True) if overwrite: pas = [wc] +followcopies = False elif pas == [p2]: # backwards -pas = [wc.p1()] -elif not branchmerge and not wc.dirty(missing=True): -pass -elif pas[0] and repo.ui.configbool('merge', 'followcopies', True): -followcopies = True +pas = [p1] +elif not pas[0]: +followcopies = False +if not branchmerge and not wc.dirty(missing=True): +followcopies = False ### calculate phase actionbyfile, diverge, renamedelete = calculateupdates( diff -r 9e59cd55604c -r 54dc76f21006 tests/test-merge-local.t --- a/tests/test-merge-local.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-merge-local.t Thu Aug 25 22:02:26 2016 +0200 @@ -66,7 +66,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') - 2 files updated, 1 files merged, 3 files removed, 1 files unresolved + 2 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] @@ -104,7 +104,7 @@ merging zzz1_merge_ok merging zzz2_merge_bad warning: conflicts while merging zzz2_merge_bad! (edit, then use 'hg resolve --mark') - 2 files updated, 1 files merged, 3 files removed, 1 files unresolved + 2 files updated, 1 files merged, 2 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges [1] diff -r 9e59cd55604c -r 54dc76f21006 tests/test-mq-subrepo.t --- a/tests/test-mq-subrepo.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-mq-subrepo.t Thu Aug 25 22:02:26 2016 +0200 @@ -304,6 +304,7 @@ record this change to '.hgsub'? [Ynesfdaq?] y warning: subrepo spec file '.hgsub' not found + warning: subrepo spec file '.hgsub' not found abort: uncommitted changes in subrepository 'sub' [255] % update substate when adding .hgsub w/clean updated subrepo @@ -319,6 +320,7 @@ record this change to '.hgsub'? [Ynesfdaq?] y warning: subrepo spec file '.hgsub' not found + warning: subrepo spec file '.hgsub' not found path sub source sub revision b2fdb12cd82b021c3b7053d67802e77b6eeaee31 diff -r 9e59cd55604c -r 54dc76f21006 tests/test-up-local-change.t --- a/tests/test-up-local-change.t Mon Oct 03 18:38:13 2016 +0200 +++ b/tests/test-up-local-change.t Thu Aug 25 22:02:26 2016 +0200 @@ -67,13 +67,18 @@ summary: 2 $ hg --debug up 0 + starting 4 threads for background file closing (?) +searching for copies back to rev 0 +computing unmatched files in rotated DAG +computing unmatched files in unrotated DAG +unmatched files in local: + b resolving manifests branchmerge: False, force: False, partial: False ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a preserving a for resolve of a b: other deleted -> r removing b - starting 4 threads for background file closing (?) a: versions differ -> m (premerge) picked tool 'true' for a (binary False symlink False changedelete False) merging a ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel