Re: Request for a review of an internal FAQ

On 19 December 2012 17:12, John Cowan <cowan_at_mercury.ccil.org> wrote:
> Michael Schierl scripsit:
>> The most likely case for a commit to fail in my experience is not
>> a conflict, but just a file that was edited by someone else in a
>> non-conflicting way.
>
> Yes, I am somewhat abusing the term "conflict" to include automatically
> resolvable conflict. We work not with source code but with XML documents
> of many types, and I am less confident that Subversion can adequately
> resolve those by itself.

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". You then have to TSVN->update which merges the
repository changes with your own, and that process may generate a
conflict.

>> In some scenarios when lots of files need to be reverted, it may be
>> easier to just delete the files and then update the working copy to
>> get the old version back.
>
> Adopted this language.

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).

> By the way, is there an easy way to pick a specific change and generate
> a new change that exactly undoes it? People do commit things by mistake
> now and then.

Yes, I do that too ;-) TSVN->Show Log is your friend here. Select the
revision you want to back out, right click and "revert changes from
this revision". You can also "Revert to this revision" which undoes
all changes made after the selected one.

Simon

--
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3037300
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].