Mercurial > hg
comparison tests/test-copy-move-merge.t @ 34077:26531db4647a
copytrace: replace experimental.disablecopytrace config with copytrace (BC)
This patch replaces experimental.disablecopytrace with experimental.copytrace.
Since the words does not means the same, the default value is also changed. Now
experimental.copytrace defaults to 'on'. The new value is not boolean value as
we will be now having two different algorithms (current one and heuristics one
to be imported from fbext) so we need this to be have more options than
booleans.
The old config option is not kept is completely replaced as that was under
experimental and we don't gurantee BC to experimental things.
.. bc::
The config option for copytrace `experimental.disablecopytrace` is now
replaced with `experimental.copytrace` which defaults to `on`. If you need to
turn off copytracing, add `[experimental] copytrace = off` to your config.
Differential Revision: https://phab.mercurial-scm.org/D621
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sun, 03 Sep 2017 01:52:19 +0530 |
parents | 3b7cb3d17137 |
children | b4b196092cc3 |
comparison
equal
deleted
inserted
replaced
34076:cd38b83bfb23 | 34077:26531db4647a |
---|---|
79 | 79 |
80 $ hg strip -r . --config extensions.strip= | 80 $ hg strip -r . --config extensions.strip= |
81 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 81 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
82 saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) | 82 saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob) |
83 $ hg up -qC 2 | 83 $ hg up -qC 2 |
84 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True --config ui.interactive=True << EOF | 84 $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.copytrace=off --config ui.interactive=True << EOF |
85 > c | 85 > c |
86 > EOF | 86 > EOF |
87 rebasing 2:add3f11052fa "other" (tip) | 87 rebasing 2:add3f11052fa "other" (tip) |
88 other [source] changed a which local [dest] deleted | 88 other [source] changed a which local [dest] deleted |
89 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c | 89 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c |
115 |/ | 115 |/ |
116 o 1 add b, c | 116 o 1 add b, c |
117 | | 117 | |
118 o 0 add a | 118 o 0 add a |
119 | 119 |
120 $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True | 120 $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.copytrace=off |
121 rebasing 2:6adcf8c12e7d "copy b->x" | 121 rebasing 2:6adcf8c12e7d "copy b->x" |
122 saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob) | 122 saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-rebase.hg (glob) |
123 $ hg up -q 3 | 123 $ hg up -q 3 |
124 $ hg log -f x -T '{rev} {desc}\n' | 124 $ hg log -f x -T '{rev} {desc}\n' |
125 3 copy b->x | 125 3 copy b->x |
148 | | | 148 | | |
149 | o 1 copy a->b | 149 | o 1 copy a->b |
150 |/ | 150 |/ |
151 o 0 add a | 151 o 0 add a |
152 | 152 |
153 $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.disablecopytrace=True | 153 $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.copytrace=off |
154 rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) | 154 rebasing 3:47e1a9e6273b "copy a->b (2)" (tip) |
155 saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob) | 155 saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-rebase.hg (glob) |
156 | 156 |
157 $ hg log -G -f b | 157 $ hg log -G -f b |
158 @ changeset: 3:76024fb4b05b | 158 @ changeset: 3:76024fb4b05b |