#164: Svn REPLACED entries needs more work
--------------------+-------------------------------------------------------
Reporter: lele | Owner: lele
Type: defect | Status: new
Priority: major | Milestone: VersionOne
Component: svn | Version: 0.9
Keywords: |
--------------------+-------------------------------------------------------
See [1649], and the following email from Andrea:
tailor stopped working for me. First I had to rollback mercurial to
1.0.1 that is the last stable release. That fixed some of the problems
but it still doesn't work anymore.
{{{
[EMAIL PROTECTED] ~ $ LANG=en_US.UTF-8 tailor --config
TwistedSVN/TwistedSVN.tailor
No username found, using '[EMAIL PROTECTED]' instead
twisted/internet/iocpreactor/__init__.py already tracked!
twisted/internet/iocpreactor/abstract.py already tracked!
twisted/internet/iocpreactor/tcp.py already tracked!
twisted/internet/iocpreactor/udp.py already tracked!
15:04:02 [C] Couldn't replay changeset:
Revision: 22957
Date: 2008-03-18 17:35:58.086515+00:00
Author: pahan
Entries: twisted/internet/base.py(UPD),
twisted/internet/iocpreactor/__init__.py(ADD),
twisted/internet/iocpreactor/abstract.py(ADD),
twisted/internet/iocpreactor/build.bat(ADD),
twisted/internet/iocpreactor/const.py(ADD),
twisted/internet/iocpreactor/interfaces.py(ADD),
twisted/internet/iocpreactor/iocpsupport[DIR](ADD),
twisted/internet/iocpreactor/iocpsupport/acceptex.pxi(ADD),
twisted/internet/iocpreactor/iocpsupport/connectex.pxi(ADD),
twisted/internet/iocpreactor/iocpsupport/iocpsupport.c(ADD),
twisted/internet/iocpreactor/iocpsupport/iocpsupport.pyx(ADD),
twisted/internet/iocpreactor/iocpsupport/winsock_pointers.c(ADD),
twisted/internet/iocpreactor/iocpsupport/winsock_pointers.h(ADD),
twisted/internet/iocpreactor/iocpsupport/wsarecv.pxi(ADD),
twisted/internet/iocpreactor/iocpsupport/wsasend.pxi(ADD),
twisted/internet/iocpreactor/notes.txt(ADD),
twisted/internet/iocpreactor/reactor.py(ADD),
twisted/internet/iocpreactor/setup.py(ADD),
twisted/internet/iocpreactor/tcp.py(ADD),
twisted/internet/iocpreactor/udp.py(ADD),
twisted/internet/posixbase.py(UPD),
twisted/internet/test/test_iocp.py(ADD),
twisted/test/test_amp.py(UPD), twisted/test/test_ftp.py(UPD),
twisted/test/test_tcp.py(UPD),
twisted/test/test_tcp_internals.py(UPD),
twisted/topfiles/setup.py(UPD), twisted/internet/iocpreactor[DIR](ADD)
Log: Merge iocpreactor-1760-6: new iocpreactor implementation
This is new and improved iocpreactor that passes all tests.
Author: PenguinOfDoom
Reviewer: therve
Fixes #1760
15:04:02 [C] Upstream change application failed: Changes left in
working dir after commit: ['twisted/internet/iocpreactor/_iocp.c',
'twisted/internet/iocpreactor/client.py',
'twisted/internet/iocpreactor/iocpdebug.py',
'twisted/internet/iocpreactor/ops.py',
'twisted/internet/iocpreactor/proactor.py',
'twisted/internet/iocpreactor/process.py',
'twisted/internet/iocpreactor/process_waiter.py',
'twisted/internet/iocpreactor/server.py',
'twisted/internet/iocpreactor/util.py']
Most probably a tailor bug, not everything has been committed.:
Changes left in working dir after commit:
['twisted/internet/iocpreactor/_iocp.c',
'twisted/internet/iocpreactor/client.py',
'twisted/internet/iocpreactor/iocpdebug.py',
'twisted/internet/iocpreactor/ops.py',
'twisted/internet/iocpreactor/proactor.py',
'twisted/internet/iocpreactor/process.py',
'twisted/internet/iocpreactor/process_waiter.py',
'twisted/internet/iocpreactor/server.py',
'twisted/internet/iocpreactor/util.py']
}}}
To reproduce just use this (change the root-directory as you wish of
course).
{{{
[DEFAULT]
#verbose = True
[project]
target = hg:target
#start-revision = INITIAL
#start-revision = 17493
start-revision = 22868
root-directory = /home/hg/TwistedSVN
state-file = tailor.state
source = svn:source
subdir = Twisted
[hg:target]
[svn:source]
# false for old svn version
#use-limit = False
#ignore-externals = False
module = /trunk
repository = svn://svn.twistedmatrix.com/svn/Twisted
}}}
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/164>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger
_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
