#50: Same problems svn -> svn
----------------------------+-----------------------------------------------
Reporter: [EMAIL PROTECTED] | Owner: lele
Type: defect | Status: new
Priority: major | Milestone: VersionOne
Component: tailor | Version: 0.9
Keywords: |
----------------------------+-----------------------------------------------
I'm using the current version (0.9.22) of tailor and I've some problem.
I want import alfresco's project in my local svn server.
I've solve almost this problem :
- in vcpx/svn.py, line 234, the last is sincerev and not sincerev+1. When
I've modify this line (become "--revision", "%d:HEAD" % (sincerev)) ) all
works fine ;
- some comments have unknown characters, in vcpx/repository.py, line 101
I've modify "'encoding-errors-policy', 'strict')" to "'encoding-errors-
policy', 'replace')" ;
- one comment has `"^M"` at this end of a line. In vcpx/svn.py; line 454,
I've modify log.write(encode('\n'.join(logmessage))) to
log.write(replace(encode('\n'.join(logmessage)), '\r', '')) (need added
"from string import replace" line 454).
Now, I've a new bug and I don't know how solve it :
{{{
08:03:01 [I] Updating "project" in "/tailor/alfresco"
08:03:01 [I] $ svn ls
http://ega:[EMAIL PROTECTED]/svn/externe_alfresco_officiel
08:03:01 [I] [Ok]
08:03:01 [I] Applying pending upstream changesets
08:03:01 [I] Changeset "2751"
08:03:01 [I] Log message: SMB code in wrong place from merge
08:03:01 [I] /tailor/alfresco/externe $ svn update --revision 2751 .
08:03:10 [I] [Ok]
08:03:10 [I] $ rsync --delete --archive --exclude .svn --exclude .svn
/tailor/alfresco/externe/ /tailor/alfresco/interne
08:03:10 [I] [Ok]
08:03:10 [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
08:03:10 [I] [Ok]
08:03:10 [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
08:03:10 [W] [Status 1]
08:03:10 [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.22/vcpx/target.py", line 112, in replayChangeset
self._replayChangeset(changeset)
File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
if renamed: self._renameEntries(renamed)
File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
self._renamePathname(e.old_name, e.name)
File "/root/tailor-0.9.22/vcpx/svn.py", line 541, in _renamePathname
raise ChangesetApplicationFailure("%s returned status %d"
NameError: global name 'err' is not defined
08:03:10 [E] Couldn't reply 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.22/vcpx/source.py", line 133, in
applyPendingChangesets
replay(c)
File "/root/tailor-0.9.22/vcpx/dualwd.py", line 107, in replayChangeset
self.target.replayChangeset(changeset)
File "/root/tailor-0.9.22/vcpx/target.py", line 112, in replayChangeset
self._replayChangeset(changeset)
File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
if renamed: self._renameEntries(renamed)
File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
self._renamePathname(e.old_name, e.name)
File "/root/tailor-0.9.22/vcpx/svn.py", line 541, in _renamePathname
raise ChangesetApplicationFailure("%s returned status %d"
NameError: global name 'err' is not defined
08:03:10 [C] Upstream change application failed
Traceback (most recent call last):
File "./tailor", line 33, in ?
main()
File "/root/tailor-0.9.22/vcpx/tailor.py", line 332, in main
tailorizer()
File "/root/tailor-0.9.22/vcpx/tailor.py", line 144, in __call__
self.update()
File "/root/tailor-0.9.22/vcpx/tailor.py", line 107, in update
last, conflicts = dwd.applyPendingChangesets(
File "/root/tailor-0.9.22/vcpx/dualwd.py", line 97, in
applyPendingChangesets
applied=applied)
File "/root/tailor-0.9.22/vcpx/source.py", line 133, in
applyPendingChangesets
replay(c)
File "/root/tailor-0.9.22/vcpx/dualwd.py", line 107, in replayChangeset
self.target.replayChangeset(changeset)
File "/root/tailor-0.9.22/vcpx/target.py", line 112, in replayChangeset
self._replayChangeset(changeset)
File "/root/tailor-0.9.22/vcpx/target.py", line 296, in _replayChangeset
if renamed: self._renameEntries(renamed)
File "/root/tailor-0.9.22/vcpx/target.py", line 423, in _renameEntries
self._renamePathname(e.old_name, e.name)
File "/root/tailor-0.9.22/vcpx/svn.py", line 541, in _renamePathname
raise ChangesetApplicationFailure("%s returned status %d"
NameError: global name 'err' is not defined
}}}
Configuration file :
{{{
[DEFAULT]
verbose = True
use-limit = False
ignore-externals = False
[project]
target = svn:target
start-revision = INITIAL
root-directory = /tailor/alfresco
state-file = tailor.state
source = svn:source
subdir = .
[svn:source]
module = /alfresco/HEAD/root
repository = svn://[EMAIL PROTECTED]
subdir = externe
[svn:target]
module = /trunk
repository = http://ega:[EMAIL PROTECTED]/svn/externe_alfresco_officiel
subdir = interne
}}}
--
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
