[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: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Thu, 20 Dec 2012 09:36:38 +0000

On 20 December 2012 03:49, John Cowan <cowan_at_mercury.ccil.org> wrote:
> Simon Large scripsit:
>> Actually you never get a conflict on the commit itself. You cannot
>> commit a file if there is a newer revision in the repository and you
>> will get an error message something like: "commit failed: your working
>> copy is out of date".
> That is what I am calling a conflict: the file has been changed in two
> different places. Automatic resolution may or may not be sufficient.

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.

I just remembered that the commit dialog may offer to do the update
for you, although I'm not 100% sure on that, but it is nonetheless the
update that is generating the conflicts.


:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-12-20 10:36:45 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.