Hello!
SK> Alexander Iljin wrote:
>> Hello!
>>
>> TortoiseSVN 1.5.5, Build 14361 - 32 Bit , 2008/10/24 18:06:34
>> Subversion 1.5.4
>>
>> I did a commit of a folder copy and a file modification (made a copy
>> of a project with a new name, so I also changed the name in a file),
>> see commit notifications below.
>>
>> While the commit was still in progress I remembered that I didn't
>> update another file, so I pressed Cancel when the commit was in the
>> "sending content" state (about halfway through).
>>
>> The Commit dialog said the commit was failed, reason: user
>> cancelled. When I clicked "OK" TSVN reopened the "Commit" dialog.
>> I made the correction (added GNUmakefile to the selection) and
>> clicked OK to start the commit again.
>>
>> The problem is that the first commit wasn't actually cancelled, as
>> the dialog has informed me. Now I have two almost identical commits
>> in the history. Subsequently I received the following two commit
>> notifications, just to give you an idea of the actual things I did:
>>
>> ===
>> Author: AlexIljin
>> Date: Wed Dec 3 15:16:58 2008
>> New Revision: 927
>>
>> Added:
>> branches/Localize/A3Test/Localize/ (props changed)
>> - copied from r926, /trunk/A3Test/TestTemplate/
>> Modified:
>> branches/Localize/A3Test/Localize/Test.ob2
>>
>> Log:
>> Created a test application for the Localize module.
>> ===
>> Author: AlexIljin
>> Date: Wed Dec 3 15:18:16 2008
>> New Revision: 928
>>
>> Added:
>> branches/Localize/A3Test/Localize/ (props changed)
>> - copied from r926, /trunk/A3Test/TestTemplate/
>> Modified:
>> branches/Localize/A3Test/GNUmakefile
>> branches/Localize/A3Test/Localize/Test.ob2
>>
>> Log:
>> Created a test application for the Localize module.
SK> Is this log output from the svn command line client? Or from the TSVN
SK> log dialog? If the TSVN log dialog, please go to the settings dialog and
SK> clear the log cache, then show the log again.
Those e-mail notifications were sent to me by the SVN hosting I use,
and since it is Linux-based, I presume it is a reformatted
command-line output. Anyway, here's the current SVN command-line
report:
xxx\Localize>svn log -v -r 927 .
------------------------------------------------------------------------
r927 | AlexIljin | 2008-12-03 20:16:58 +0600 (Ср, 03 дек 2008) | 1 line
Changed paths:
A /branches/Localize/A3Test/Localize (from /trunk/A3Test/TestTemplate:926)
M /branches/Localize/A3Test/Localize/Test.ob2
Created a test application for the Localize module.
------------------------------------------------------------------------
xxx\Localize>svn log -v -r 928 .
------------------------------------------------------------------------
r928 | AlexIljin | 2008-12-03 20:18:16 +0600 (Ср, 03 дек 2008) | 1 line
Changed paths:
M /branches/Localize/A3Test/GNUmakefile
R /branches/Localize/A3Test/Localize (from /trunk/A3Test/TestTemplate:926)
M /branches/Localize/A3Test/Localize/Test.ob2
Created a test application for the Localize module.
------------------------------------------------------------------------
Notice the "R" for "Replaced" in the command-line output for the
rev928.
>> ===
>>
>> I expect the commit progress window would say that the commit was
>> successful, not "user cancelled", so that I would only have to add
>> the GNUmakefile on the next commit, and not redo the folder copying.
>>
>> Come to think of it, the working copy was probably in a state
>> inconsistent with the actual commit result, if TSVN kept thinking
>> the folder copying was still pending, but I'll let you guys judge on
>> that one.
SK> If the first commit wasn't really cancelled, the second commit should
SK> have failed: a commit can't be done twice with the same modifications
SK> sent. The repository would reject such a commit with an 'out-of-date' error
I thought so, too, but notice that the file being modified is inside
the copied folder. This means that in rev927 I created the Localize
folder (taken with its contents from rev926) and changed the file
inside it, and then in rev928 I created the NEW Localize folder,
replacing the old one with the new copy of rev926, and then changed
the new file inside it, again.
---=====---
Alexander
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=984588
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2008-12-15 19:03:13 CET