84 

    84 

    85 Rebase interrupts on conflicting changes outside narrow spec

    85 Rebase interrupts on conflicting changes outside narrow spec

    86 

    86 

    87   $ hg update -q 'desc("conflicting outside/f1")'

    87   $ hg update -q 'desc("conflicting outside/f1")'

    88   $ hg phase -f -d .

    88   $ hg phase -f -d .

    90   $ hg rebase -d 'desc("modify outside/f1")'

    89   $ hg rebase -d 'desc("modify outside/f1")'

    91   rebasing 4:707c035aadb6 "conflicting outside/f1"

    90   rebasing 4:707c035aadb6 "conflicting outside/f1"

    92   abort: conflict in file 'outside/f1' is outside narrow clone

    91   abort: conflict in file 'outside/f1' is outside narrow clone

    93   [255]

    92   [255]