Re: Update/switch with an existing tree-conflict for move-update

2013-03-05 Thread Julian Foad
Stefan Sperling wrote: > On Tue, Mar 05, 2013 at 04:37:03PM +, Philip Martin wrote: >>     not single-revision >> >>   - the user cannot update to single-revision because the tree-conflict >>     must be resolved first >> >> To get out of this situation I think we have to allow the user

Re: Update/switch with an existing tree-conflict for move-update

2013-03-05 Thread Stefan Sperling
On Tue, Mar 05, 2013 at 04:37:03PM +, Philip Martin wrote: > not single-revision > > - the user cannot update to single-revision because the tree-conflict > must be resolved first > > To get out of this situation I think we have to allow the user to update > (or switch) the move sou