#50: Same problems svn -> svn
-----------------------------+----------------------------------------------
Reporter: [EMAIL PROTECTED] | Owner: lele
Type: defect | Status: reopened
Priority: major | Milestone: VersionOne
Component: svn | Version: 0.9
Resolution: | Keywords:
-----------------------------+----------------------------------------------
Comment (by ega):
It doesn't work. I'm using the version 0.9.23 of tailor. I've suppress all
sources to restart from begining, but I've this error too :
{{{
09:50:57 [I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
09:50:57 [I] Changeset "2751"
09:50:57 [I] Log message: SMB code in wrong place from merge
09:50:57 [I] /tailor/alfresco/externe $ svn update --revision 2751 .
09:50:59 [I] [Ok]
09:50:59 [I] $ rsync --archive --exclude .svn --exclude .svn
/tailor/alfresco/externe/ /tailor/alfresco/interne
09:50:59 [I] [Ok]
09:50:59 [I] /tailor/alfresco/interne $ svn add --quiet --no-auto-props
--non-recursive
projects/repository/source/java/org/alfresco/filesys/server/smb
09:50:59 [I] [Ok]
09:50:59 [I] /tailor/alfresco/interne $ svn add --quiet --no-auto-props
--non-recursive projects projects/repository projects/repository/source
projects/repository/source/java projects/repository/source/java/org
projects/repository/source/java/org/alfresco
projects/repository/source/java/org/alfresco/filesys
projects/repository/source/java/org/alfresco/filesys/server
projects/repository/source/java/org/alfresco/filesys/server/smb
09:50:59 [I] [Ok]
09:50:59 [I] /tailor/alfresco/interne $ svn mv --quiet --force
projects/repository/source/java/org/alfresco/filesys/smb/repo
projects/repository/source/java/org/alfresco/filesys/server/smb/repo
09:50:59 [I] [Ok]
09:50:59 [E] Failure replaying: Revision: 2751
Date: 2006-05-04 08:52:16.747255
Author: paulhh
Renamed:
projects/repository/source/java/org/alfresco/filesys/server/smb/repo (from
projects/repository/source/java/org/alfresco/filesys/smb/repo)
Added: projects/repository/source/java/org/alfresco/filesys/server/smb
Log: SMB code in wrong place from merge
Traceback (most recent call last):
File "/root/tailor-0.9.23/vcpx/target.py", line 112, in replayChangeset
self._replayChangeset(changeset)
File "/root/tailor-0.9.23/vcpx/target.py", line 294, in _replayChangeset
action(group)
File "/root/tailor-0.9.23/vcpx/target.py", line 439, in _renameEntries
rename(absnew + '-TAILOR-HACKED-TEMP-NAME', absnew)
OSError: [Errno 39] Directory not empty
09:50:59 [E] Couldn't replay changeset
Revision: 2751
Date: 2006-05-04 08:52:16.747255
Author: paulhh
Renamed:
projects/repository/source/java/org/alfresco/filesys/server/smb/repo (from
projects/repository/source/java/org/alfresco/filesys/smb/repo)
Added: projects/repository/source/java/org/alfresco/filesys/server/smb
Log: SMB code in wrong place from merge
Traceback (most recent call last):
File "/root/tailor-0.9.23/vcpx/source.py", line 133, in
applyPendingChangesets
replay(c)
File "/root/tailor-0.9.23/vcpx/dualwd.py", line 107, in replayChangeset
self.target.replayChangeset(changeset)
File "/root/tailor-0.9.23/vcpx/target.py", line 112, in replayChangeset
self._replayChangeset(changeset)
File "/root/tailor-0.9.23/vcpx/target.py", line 294, in _replayChangeset
action(group)
File "/root/tailor-0.9.23/vcpx/target.py", line 439, in _renameEntries
rename(absnew + '-TAILOR-HACKED-TEMP-NAME', absnew)
OSError: [Errno 39] Directory not empty
09:50:59 [I] 186 pending changesets in state file
09:50:59 [C] Upstream change application failed
Traceback (most recent call last):
File "./tailor", line 33, in ?
main()
File "/root/tailor-0.9.23/vcpx/tailor.py", line 332, in main
tailorizer()
File "/root/tailor-0.9.23/vcpx/tailor.py", line 144, in __call__
self.update()
File "/root/tailor-0.9.23/vcpx/tailor.py", line 107, in update
last, conflicts = dwd.applyPendingChangesets(
File "/root/tailor-0.9.23/vcpx/dualwd.py", line 97, in
applyPendingChangesets
applied=applied)
File "/root/tailor-0.9.23/vcpx/source.py", line 133, in
applyPendingChangesets
replay(c)
File "/root/tailor-0.9.23/vcpx/dualwd.py", line 107, in replayChangeset
self.target.replayChangeset(changeset)
File "/root/tailor-0.9.23/vcpx/target.py", line 112, in replayChangeset
self._replayChangeset(changeset)
File "/root/tailor-0.9.23/vcpx/target.py", line 294, in _replayChangeset
action(group)
File "/root/tailor-0.9.23/vcpx/target.py", line 439, in _renameEntries
rename(absnew + '-TAILOR-HACKED-TEMP-NAME', absnew)
OSError: [Errno 39] Directory not empty
machine:~/tailor-0.9.23#
}}}
I've tried to remove
/tailor/alfresco/interne/projects/repository/source/java/org/alfresco/filesys/server/smb
/repo-TAILOR-HACKED-TEMP-NAME but the script re-create it.
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/50>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
