[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Request for a review of an internal FAQ

From: John Cowan <cowan_at_mercury.ccil.org>
Date: Thu, 20 Dec 2012 15:47:02 -0500

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
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-12-20 21:47:09 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.