#96: cvs --> mercurial: remove again error?
----------------------------+-----------------------------------------------
Reporter: ThurnerRupert | Owner: lele
Type: defect | Status: new
Priority: major | Milestone: VersionOne
Component: tailor | Version: 0.9
Resolution: | Keywords: cvs mercurial
----------------------------+-----------------------------------------------
Comment (by kgk):
I maybe having a similar issue.. May be caused by files being added and
removed
in the same patch set. Or could be the way that changes set are
propagated using
rsync.. see the trace below... note that rsync will remove the files
in the target directory and therefore applying the patch will fail to be
able
to remove the same files?
{{{
2007-03-01 12:18:28 WARNING: Forcing UTF-8 encoding instead of ISO-8859-1
2007-03-01 12:18:28 INFO: Updating "project" in "/home/kgk/work/ome-
tailor"
2007-03-01 12:18:28 INFO: $ cvs -f -d
:pserver:[EMAIL PROTECTED]:/ome rlog -d "2006-12-20
21:11:43 UTC<" -b OME
2007-03-01 12:18:43 INFO: [Ok]
2007-03-01 12:18:44 INFO: Cached information about 63 pending
changesets
2007-03-01 12:18:44 INFO: Applying pending upstream changesets
2007-03-01 12:18:44 INFO: Changeset "2007-01-12 20:21:37 by tmacur1"
2007-03-01 12:18:44 INFO: Log message: forget about hash-tables, use
statically allocated LUTs
2007-03-01 12:18:50 INFO: /home/kgk/work/ome-tailor/OME-hg2cvs $ cvs
-f -d :pserver:[EMAIL PROTECTED]:/ome -q update -d -r 1.4
src/matlab/OME/Statistics/HaralickTextures/Makefile
2007-03-01 12:20:48 INFO: [Ok]
2007-03-01 12:20:48 INFO: /home/kgk/work/ome-tailor/OME-hg2cvs $ cvs
-f -d :pserver:[EMAIL PROTECTED]:/ome -q update -d -r 1.8
src/matlab/OME/Statistics/HaralickTextures/CVIPtexture.c
2007-03-01 12:20:50 INFO: [Ok]
2007-03-01 12:20:50 INFO: registering new
src/matlab/OME/Statistics/HaralickTextures directory
2007-03-01 12:20:50 INFO: $ rsync --archive --exclude CVS --exclude
.hg --exclude .hgtags /home/kgk/work/ome-tailor/OME-hg2cvs/ /home/kgk/work
/ome-tailor/OME-hg2
2007-03-01 12:20:51 INFO: [Ok]
2007-03-01 12:20:51 INFO: Adding
src/matlab/OME/Statistics/HaralickTextures/CVIPtexture.c,
src/matlab/OME/Statistics/HaralickTextures/Makefile...
2007-03-01 12:20:51 INFO: Removing
src/matlab/OME/Statistics/HaralickTextures/mapkit.c,
src/matlab/OME/Statistics/HaralickTextures/mapkit.h,
src/matlab/OME/Statistics/HaralickTextures/mapkit_generic.c,
src/matlab/OME/Statistics/HaralickTextures/mapkit_generic.h...
2007-03-01 12:20:52 INFO: Adding
src/matlab/OME/Statistics/HaralickTextures/Makefile,
src/matlab/OME/Statistics/HaralickTextures/CVIPtexture.c...
2007-03-01 12:20:52 INFO: Committing u'forget about hash-tables, use
statically allocated LUTs'...
2007-03-01 12:20:52 ERROR: Couldn't replay changeset
Revision: 2007-01-12 20:21:37 by tmacur1
Date: 2007-01-12 20:21:38+00:00
Author: tmacur1
Entries: src/matlab/OME/Statistics/HaralickTextures(ADD),
src/matlab/OME/Statistics/HaralickTextures/CVIPtexture.c(ADD at 1.8),
src/matlab/OME/Statistics/HaralickTextures/Makefile(ADD at 1.4),
src/matlab/OME/Statistics/HaralickTextures/mapkit.c(DEL at 1.3),
src/matlab/OME/Statistics/HaralickTextures/mapkit.h(DEL at 1.3),
src/matlab/OME/Statistics/HaralickTextures/mapkit_generic.c(DEL at 1.2),
src/matlab/OME/Statistics/HaralickTextures/mapkit_generic.h(DEL at 1.4)
Log: forget about hash-tables, use statically allocated LUTs
Traceback (most recent call last):
File "/var/lib/python-support/python2.4/vcpx/source.py", line 140, in
applyPendingChangesets
replay(c)
File "/var/lib/python-support/python2.4/vcpx/dualwd.py", line 107, in
replayChangeset
self.target.replayChangeset(changeset)
File "/var/lib/python-support/python2.4/vcpx/target.py", line 126, in
replayChangeset
entries)
File "/var/lib/python-support/python2.4/vcpx/repository/hg.py", line
277, in _commit
self._hgCommand('commit', *[encode(n) for n in names], **opts)
File "/var/lib/python-support/python2.4/vcpx/repository/hg.py", line
328, in _hgCommand
cmd(self._ui, self._hg, *args, **allopts)
File "/var/lib/python-support/python2.4/mercurial/commands.py", line
437, in commit
raise util.Abort(_("file %s not found!") % rf)
Abort: file /home/kgk/work/ome-tailor/OME-
hg2/src/matlab/OME/Statistics/HaralickTextures/mapkit.c not found!
2007-03-01 12:20:52 CRITICAL: Upstream change application failed
}}}
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/96#comment:2>
Tailor <http://progetti.arstecnica.it/tailor>
An inter-VCs changeset exchanger_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
