equal
deleted
inserted
replaced
84 o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 |
84 o changeset: e5b71fb099c29d9172ef4a23485aaffd497e4cc0 |
85 desc: initial |
85 desc: initial |
86 |
86 |
87 $ hg rebase -s . -d 1 |
87 $ hg rebase -s . -d 1 |
88 rebasing 2:d526312210b9 "mode a" (tip) |
88 rebasing 2:d526312210b9 "mode a" (tip) |
89 file 'a' was deleted in other [source] but was modified in local [dest]. |
89 file 'a' was deleted in local [dest] but was modified in other [source]. |
90 What do you want to do? |
90 What do you want to do? |
91 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
91 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
92 unresolved conflicts (see hg resolve, then hg rebase --continue) |
92 unresolved conflicts (see hg resolve, then hg rebase --continue) |
93 [1] |
93 [1] |
94 |
94 |
241 With small limit |
241 With small limit |
242 |
242 |
243 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 |
243 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 |
244 rebasing 2:ef716627c70b "mod a" (tip) |
244 rebasing 2:ef716627c70b "mod a" (tip) |
245 skipping copytracing for 'a', more candidates than the limit: 7 |
245 skipping copytracing for 'a', more candidates than the limit: 7 |
246 file 'a' was deleted in other [source] but was modified in local [dest]. |
246 file 'a' was deleted in local [dest] but was modified in other [source]. |
247 What do you want to do? |
247 What do you want to do? |
248 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
248 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
249 unresolved conflicts (see hg resolve, then hg rebase --continue) |
249 unresolved conflicts (see hg resolve, then hg rebase --continue) |
250 [1] |
250 [1] |
251 |
251 |
697 |
697 |
698 When the sourcecommitlimit is small and we have more drafts, we use heuristics only |
698 When the sourcecommitlimit is small and we have more drafts, we use heuristics only |
699 |
699 |
700 $ hg rebase -s 8b6e13696 -d . |
700 $ hg rebase -s 8b6e13696 -d . |
701 rebasing 1:8b6e13696c38 "added more things to a" |
701 rebasing 1:8b6e13696c38 "added more things to a" |
702 file 'a' was deleted in other [source] but was modified in local [dest]. |
702 file 'a' was deleted in local [dest] but was modified in other [source]. |
703 What do you want to do? |
703 What do you want to do? |
704 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
704 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
705 unresolved conflicts (see hg resolve, then hg rebase --continue) |
705 unresolved conflicts (see hg resolve, then hg rebase --continue) |
706 [1] |
706 [1] |
707 |
707 |