59 |
59 |
60 $ hg update -q 0 |
60 $ hg update -q 0 |
61 $ echo modified > inside/f2 |
61 $ echo modified > inside/f2 |
62 $ hg ci -qm 'modify inside/f2' |
62 $ hg ci -qm 'modify inside/f2' |
63 $ hg rebase -d 'desc("modify inside/f1")' |
63 $ hg rebase -d 'desc("modify inside/f1")' |
64 rebasing 5:c2f36d04e05d "modify inside/f2" (tip) |
64 rebasing 5:c2f36d04e05d tip "modify inside/f2" |
65 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
65 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
66 |
66 |
67 Can rebase onto conflicting changes inside narrow spec |
67 Can rebase onto conflicting changes inside narrow spec |
68 |
68 |
69 $ hg update -q 0 |
69 $ hg update -q 0 |
70 $ echo conflicting > inside/f1 |
70 $ echo conflicting > inside/f1 |
71 $ hg ci -qm 'conflicting inside/f1' |
71 $ hg ci -qm 'conflicting inside/f1' |
72 $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)' |
72 $ hg rebase -d 'desc("modify inside/f1")' 2>&1 | egrep -v '(warning:|incomplete!)' |
73 rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip) |
73 rebasing 6:cdce97fbf653 tip "conflicting inside/f1" |
74 merging inside/f1 |
74 merging inside/f1 |
75 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
75 unresolved conflicts (see 'hg resolve', then 'hg rebase --continue') |
76 $ echo modified3 > inside/f1 |
76 $ echo modified3 > inside/f1 |
77 $ hg resolve -m 2>&1 | grep -v continue: |
77 $ hg resolve -m 2>&1 | grep -v continue: |
78 (no more unresolved files) |
78 (no more unresolved files) |
79 $ hg continue |
79 $ hg continue |
80 rebasing 6:cdce97fbf653 "conflicting inside/f1" (tip) |
80 rebasing 6:cdce97fbf653 tip "conflicting inside/f1" |
81 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
81 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
82 |
82 |
83 Can rebase onto non-conflicting changes outside narrow spec |
83 Can rebase onto non-conflicting changes outside narrow spec |
84 |
84 |
85 $ hg update -q 0 |
85 $ hg update -q 0 |
86 $ echo modified > inside/f2 |
86 $ echo modified > inside/f2 |
87 $ hg ci -qm 'modify inside/f2' |
87 $ hg ci -qm 'modify inside/f2' |
88 $ hg rebase -d 'desc("modify outside/f1")' |
88 $ hg rebase -d 'desc("modify outside/f1")' |
89 rebasing 7:c2f36d04e05d "modify inside/f2" (tip) |
89 rebasing 7:c2f36d04e05d tip "modify inside/f2" |
90 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
90 saved backup bundle to $TESTTMP/narrow/.hg/strip-backup/*-rebase.hg (glob) |
91 |
91 |
92 Rebase interrupts on conflicting changes outside narrow spec |
92 Rebase interrupts on conflicting changes outside narrow spec |
93 |
93 |
94 $ hg update -q 'desc("conflicting outside/f1")' |
94 $ hg update -q 'desc("conflicting outside/f1")' |