Ticket #7 (closed defect: fixed)
double deleted file?
| Reported by: | oohlaf@… | Owned by: | lele |
|---|---|---|---|
| Priority: | major | Milestone: | VersionOne |
| Component: | tailor | Version: | 0.9 |
| Keywords: | Cc: |
Description
CVS Delete Bug
Using a nightly cvs tarbal from sf.net cvs repo, the tailorization fails at commit 583.
It says a couple of files are already deleted in the previous cvs commit and skips them. It ends up with an empty changeset and the svn target commit fails.
Config
#!/usr/bin/env /usr/local/bin/tailor
'''
[DEFAULT]
verbose = True
encoding = iso8859-15
projects = composestar
[composestar]
root-directory = /srv/tailor/composestar
subdir = cvs2svn
state-file = tailor.state
source = cvs:composestar
target = svn:composestar
start-revision = INITIAL
#before-commit = composestar_remap_authors
[cvs:composestar]
repository = :local:/srv/cvs/composestar
#repository = :pserver:anonymous@cvs.sourceforge.net:/cvsroot/composestar
module = composestar
[svn:composestar]
repository = http://localhost/svn/project/composestar
module = sourceforge/cvs
use-propset = True
'''
Tailor output
2005-09-24 21:16:07,754 [INFO] temp/ComposestarVSAddin/AbstractManager.cs updated to 1.3
2005-09-24 21:16:07,756 [INFO] skipping 'temp/ComposestarVSAddin/AbstractManager.cs' since it's already deleted
2005-09-24 21:16:07,785 [INFO] temp/ComposestarVSAddin/ComposestarVSAddin.csproj updated to 1.3
2005-09-24 21:16:07,787 [INFO] skipping 'temp/ComposestarVSAddin/ComposestarVSAddin.csproj' since it's already deleted
2005-09-24 21:16:07,814 [INFO] temp/ComposestarVSAddin/Connect.cs updated to 1.3
2005-09-24 21:16:07,816 [INFO] skipping 'temp/ComposestarVSAddin/Connect.cs' since it's already deleted
2005-09-24 21:16:07,844 [INFO] temp/ComposestarVSAddin/Ini.cs updated to 1.3
2005-09-24 21:16:07,846 [INFO] skipping 'temp/ComposestarVSAddin/Ini.cs' since it's already deleted
2005-09-24 21:16:07,873 [INFO] temp/ComposestarVSAddin/ConfigManager/ConfigManager.cs updated to 1.2
2005-09-24 21:16:11,754 [INFO] temp/ComposestarVSAddin/ConfigManager/ConfigManager.cs updated to 1.3
2005-09-24 21:16:11,782 [INFO] temp/ComposestarVSAddin/DummyManager/Dummy.cs updated to 1.3
2005-09-24 21:16:11,784 [INFO] skipping 'temp/ComposestarVSAddin/DummyManager/Dummy.cs' since it's already deleted
2005-09-24 21:16:11,812 [INFO] temp/ComposestarVSAddin/DummyManager/DummyGenerator.cs updated to 1.3
2005-09-24 21:16:11,814 [INFO] skipping 'temp/ComposestarVSAddin/DummyManager/DummyGenerator.cs' since it's already deleted
2005-09-24 21:16:11,842 [INFO] temp/ComposestarVSAddin/DummyManager/DummyManager.cs updated to 1.3
2005-09-24 21:16:11,844 [INFO] skipping 'temp/ComposestarVSAddin/DummyManager/DummyManager.cs' since it's already deleted
2005-09-24 21:16:11,871 [INFO] temp/ComposestarVSAddin/DummyManager/TypeHarvester.cs updated to 1.3
2005-09-24 21:16:11,873 [INFO] skipping 'temp/ComposestarVSAddin/DummyManager/TypeHarvester.cs' since it's already deleted
2005-09-24 21:16:14,729 [ERROR] Upstream change application failed
Traceback (most recent call last):
File "/home/olaf/Repository/tailor/vcpx/tailor.py", line 109, in update
last, conflicts = dwd.applyPendingChangesets(
File "/home/olaf/Repository/tailor/vcpx/dualwd.py", line 96, in applyPendingChangesets
applied=applied)
File "/home/olaf/Repository/tailor/vcpx/source.py", line 116, in applyPendingChangesets
replay(c)
File "/home/olaf/Repository/tailor/vcpx/dualwd.py", line 106, in replayChangeset
self.target.replayChangeset(changeset)
File "/home/olaf/Repository/tailor/vcpx/target.py", line 111, in replayChangeset
self._commit(changeset.date, changeset.author, patchname, log, entries)
File "/home/olaf/Repository/tailor/vcpx/svn.py", line 361, in _commit
raise ChangesetApplicationFailure("%s returned status %d" %
ChangesetApplicationFailure: /srv/tailor/composestar/cvs2svn $ svn commit --file /tmp/tailor82OQEisvn temp/ComposestarVSAddin/ConfigManager/ConfigManager.cs temp/ComposestarVSAddin/DummyManager/Dummy.cs temp/ComposestarVSAddin/DummyManager/Dummy.cs temp/ComposestarVSAddin/DummyManager/DummyGenerator.cs temp/ComposestarVSAddin/DummyManager/DummyGenerator.cs temp/ComposestarVSAddin/DummyManager/DummyManager.cs temp/ComposestarVSAddin/DummyManager/DummyManager.cs temp/ComposestarVSAddin/DummyManager/TypeHarvester.cs temp/ComposestarVSAddin/DummyManager/TypeHarvester.cs returned status 1
Change History
comment:2 Changed 8 years ago by oohlaf@…
And the last two svn logs:
$ svn log ------------------------------------------------------------------------ r583 | sverre | 2004-07-15 10:28:02 +0200 (Thu, 15 Jul 2004) | 1 line Tailorized "2004-07-15 08:28:02 by sverre_boschman" ------------------------------------------------------------------------ r582 | raymond | 2004-07-15 00:15:18 +0200 (Thu, 15 Jul 2004) | 2 lines Tailorized "2004-07-14 22:15:17 by rbosman" Dummy adaption. ------------------------------------------------------------------------
Note: See
TracTickets for help on using
tickets.
Console output from where it goes wrong: