[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: Wed, 19 Dec 2012 22:49:50 -0500

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.

> I would be wary of promoting that method. It does work, but if you
> delete the files, then get distracted or go for coffee and forget to
> update you could accidentally commit the deletion later. If you
> TSVN->revert the directory rather than an individual file you are
> given a list of modified files and you can use the checkboxes to
> select which ones to revert (default is everything unchecked).

Okay, I've gone with that approach instead.

A: "Spiro conjectures Ex-Lax."                  John Cowan
Q: "What does Pat Nixon frost her cakes with?"  cowan_at_ccil.org
  --"Jeopardy" for generative semanticists      http://www.ccil.org/~cowan
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-12-20 04:50:01 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.