equal
deleted
inserted
replaced
87 desc: initial |
87 desc: initial |
88 |
88 |
89 $ hg rebase -s . -d 1 |
89 $ hg rebase -s . -d 1 |
90 rebasing 2:d526312210b9 "mode a" (tip) |
90 rebasing 2:d526312210b9 "mode a" (tip) |
91 file 'a' was deleted in local [dest] but was modified in other [source]. |
91 file 'a' was deleted in local [dest] but was modified in other [source]. |
92 What do you want to do? |
92 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
93 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
93 What do you want to do? u |
94 unresolved conflicts (see hg resolve, then hg rebase --continue) |
94 unresolved conflicts (see hg resolve, then hg rebase --continue) |
95 [1] |
95 [1] |
96 |
96 |
97 $ cd .. |
97 $ cd .. |
98 $ rm -rf repo |
98 $ rm -rf repo |
244 |
244 |
245 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 |
245 $ hg rebase -s 2 -d 1 --config experimental.copytrace.movecandidateslimit=0 |
246 rebasing 2:ef716627c70b "mod a" (tip) |
246 rebasing 2:ef716627c70b "mod a" (tip) |
247 skipping copytracing for 'a', more candidates than the limit: 7 |
247 skipping copytracing for 'a', more candidates than the limit: 7 |
248 file 'a' was deleted in local [dest] but was modified in other [source]. |
248 file 'a' was deleted in local [dest] but was modified in other [source]. |
249 What do you want to do? |
249 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
250 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
250 What do you want to do? u |
251 unresolved conflicts (see hg resolve, then hg rebase --continue) |
251 unresolved conflicts (see hg resolve, then hg rebase --continue) |
252 [1] |
252 [1] |
253 |
253 |
254 $ hg rebase --abort |
254 $ hg rebase --abort |
255 rebase aborted |
255 rebase aborted |
700 When the sourcecommitlimit is small and we have more drafts, we use heuristics only |
700 When the sourcecommitlimit is small and we have more drafts, we use heuristics only |
701 |
701 |
702 $ hg rebase -s 1 -d . |
702 $ hg rebase -s 1 -d . |
703 rebasing 1:8b6e13696c38 "added more things to a" |
703 rebasing 1:8b6e13696c38 "added more things to a" |
704 file 'a' was deleted in local [dest] but was modified in other [source]. |
704 file 'a' was deleted in local [dest] but was modified in other [source]. |
705 What do you want to do? |
705 You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved. |
706 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u |
706 What do you want to do? u |
707 unresolved conflicts (see hg resolve, then hg rebase --continue) |
707 unresolved conflicts (see hg resolve, then hg rebase --continue) |
708 [1] |
708 [1] |
709 |
709 |
710 But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do |
710 But when we have "sourcecommitlimit > (no. of drafts from base to c1)", we do |
711 fullcopytracing |
711 fullcopytracing |