Commit 4f7897ab19daf6593b35c7f5b4f35403d00530ef

Edward Thomson 2013-07-22T08:51:29

Prevent checkout_tree when conflicts exist, clear NAME on checkout tree Prevent checkout tree when unresolved changes exist (unless FORCE flag is specified). Clear NAME table when checking out, to avoid checkout_conflicts from attempting to manipulate it. Ensure that NAME is also cleared at reset.