Re: Request for a review of an internal FAQ

Simon Large scripsit:

> Sorry but no, your description is not correct. When you get the
> 'commit failed' message, your files are not in a conflicted state and
> there are no >>> <<< markers in them. That doesn't happen until you do
> the TSVN->Update, which attempts to merge the repository changes with
> your local changes. Commit never changes anything.

Thanks. I have revised my FAQ in terms of this understanding.

-- 
Babies are born as a result of the              John Cowan
mating between men and women, and most          http://www.ccil.org/~cowan
men and women enjoy mating.                     cowan_at_ccil.org
    --Isaac Asimov in Earth: Our Crowded Spaceship
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3037742
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].