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

Re: Reopened Commit dialog resulted in double commit

From: Stefan Kueng <tortoisesvn_at_gmail.com>
Date: Mon, 15 Dec 2008 18:35:07 +0100

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.

Is this log output from the svn command line client? Or from the TSVN
log dialog? If the TSVN log dialog, please go to the settings dialog and
clear the log cache, then show the log again.

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

If the first commit wasn't really cancelled, the second commit should
have failed: a commit can't be done twice with the same modifications
sent. The repository would reject such a commit with an 'out-of-date' error.

Stefan

-- 
       ___
  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=984579
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2008-12-15 18:37:43 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.