#77: double move causes "svn: There is already a versioned item"
----------------------------+-----------------------------------------------
Reporter: keturn | Owner: lele
Type: defect | Status: new
Priority: major | Milestone: VersionOne
Component: tailor | Version: 0.9
Keywords: svn darcs move |
----------------------------+-----------------------------------------------
I have patch with two renames, and perhaps tailor is trying to do them in
the wrong order?
darcs to svn, shared subdir.
The repository is available at
http://www.openidenabled.com/resources/repos/php/openid/
Here's the error:
{{{
13:31:52 [I] /home/kevint/tailor-openid/try/php-openid $ darcs changes
--match "hash 20060128002515-72b7c-
0ae85a7c63372fd8627aa8494457cfaef56194e6.gz" --xml-output --summ
13:31:52 [I] [Ok]
Output stream:
<changelog>
<patch author='Josh Hoyt <[EMAIL PROTECTED]>' date='20060128002515'
local_date='Fri Jan 27 16:25:15 PST 2006' inverted='False'
hash='20060128002515-72b7c-0ae85a7c63372fd8627aa8494457cfaef56194e6.gz'>
<name>OIDUtil -> Util</name>
<summary>
<move from="Auth/OpenID/OIDUtil.php" to="Auth/OpenID/Util.php"/>
<move from="Tests/Auth/OpenID/Util.php"
to="Tests/Auth/OpenID/TestUtil.php"/>
<move from="Tests/Auth/OpenID/OIDUtil.php"
to="Tests/Auth/OpenID/Util.php"/>
<modify_file>
Auth/OpenID/Association.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Auth/OpenID/Consumer/Consumer.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Auth/OpenID/Server.php<removed_lines num='1'/><added_lines num='1'/>
</modify_file>
<modify_file>
Auth/OpenID/Store/FileStore.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Auth/OpenID/Util.php<removed_lines num='1'/><added_lines num='1'/>
</modify_file>
<modify_file>
Tests/Auth/OpenID/BigMath.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Tests/Auth/OpenID/Consumer.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Tests/Auth/OpenID/DiffieHellman.php<removed_lines
num='1'/><added_lines num='1'/>
</modify_file>
<modify_file>
Tests/Auth/OpenID/HMACSHA1.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Tests/Auth/OpenID/Parse.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Tests/Auth/OpenID/StoreTest.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Tests/Auth/OpenID/TrustRoot.php<removed_lines num='1'/><added_lines
num='1'/>
</modify_file>
<modify_file>
Tests/Auth/OpenID/Util.php<removed_lines num='2'/><added_lines
num='2'/>
</modify_file>
<modify_file>
Tests/TestDriver.php<removed_lines num='1'/><added_lines num='1'/>
</modify_file>
</summary>
</patch>
</changelog>
13:31:52 [I] /home/kevint/tailor-openid/try/php-openid $ svn add --quiet
--no-auto-props --non-recursive Auth Auth/OpenID
13:31:52 [I] [Ok]
13:31:52 [I] /home/kevint/tailor-openid/try/php-openid $ svn mv --quiet
--force Auth/OpenID/OIDUtil.php Auth/OpenID/Util.php
13:31:53 [W] [Status 1]
Error stream:
svn: There is already a versioned item 'Auth/OpenID/Util.php'
13:31:53 [E] Failure replaying: Revision: OIDUtil -> Util
Date: 2006-01-28 00:25:15+00:00
Author: Josh Hoyt <[EMAIL PROTECTED]>
Entries: Auth/OpenID/Util.php(REN from Auth/OpenID/OIDUtil.php),
Tests/Auth/OpenID/TestUtil.php(REN from Tests/Auth/OpenID/Util.php),
Tests/Auth/OpenID/Util.php(REN from Tests/Auth/OpenID/OIDUtil.php),
Auth/OpenID/Association.php(UPD), Auth/OpenID/Consumer/Consumer.php(UPD),
Auth/OpenID/Server.php(UPD), Auth/OpenID/Store/FileStore.php(UPD),
Auth/OpenID/Util.php(UPD), Tests/Auth/OpenID/BigMath.php(UPD),
Tests/Auth/OpenID/Consumer.php(UPD),
Tests/Auth/OpenID/DiffieHellman.php(UPD),
Tests/Auth/OpenID/HMACSHA1.php(UPD), Tests/Auth/OpenID/Parse.php(UPD),
Tests/Auth/OpenID/StoreTest.php(UPD),
Tests/Auth/OpenID/TrustRoot.php(UPD), Tests/Auth/OpenID/Util.php(UPD),
Tests/TestDriver.php(UPD)
Log:
Traceback (most recent call last):
File "/home/kevint/src/tailor/vcpx/target.py", line 117, in
replayChangeset
self._replayChangeset(changeset)
File "/home/kevint/src/tailor/vcpx/target.py", line 312, in
_replayChangeset
action(group)
File "/home/kevint/src/tailor/vcpx/target.py", line 473, in
_renameEntries
self._renamePathname(e.old_name, e.name)
File "/home/kevint/src/tailor/vcpx/repository/svn.py", line 640, in
_renamePathname
raise ChangesetApplicationFailure("%s returned status %d saying\n%s"
ChangesetApplicationFailure: /home/kevint/tailor-openid/try/php-openid $
svn mv --quiet --force Auth/OpenID/OIDUtil.php Auth/OpenID/Util.php
returned status 1 saying
svn: There is already a versioned item 'Auth/OpenID/Util.php'
}}}
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/77>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
