git->svn conversion fails due to incorrectly adding files to SVN repos

[bkor]

Using tailor latest darcs and tailor 0.9.30:

To reproduce:

$ mkdir -p ~/src/tailor

Put the swfdec-gnome.tailor in ~/src/tailor (I'll attach it later)

$ git clone git://anongit.freedesktop.org/git/swfdec/swfdec-gnome git/swfdec-gnome
$ tailor -c swfdec-gnome.tailor

After a while it crashes with:

Error stream:
svn: 'src/swfdec-thumbnailer.schemas.in' is not under version control
00:47:59 [E] Failure replaying: Revision: e69e0dd1319e1003a30ef936fc6c6fdefcb8c6b7
Date: 2007-10-16 14:16:07+03:00
Author: Pekka Lampila <pekka.lampila@iki.fi>
Entries: Makefile.am(UPD), configure.ac(UPD), m4/as-compiler-flag.m4(DEL), po/POTFILES.in(UPD), thumbnailer/Makefile.am(REN from src/Makefile.am), thumbnailer/swfdec-thumbnailer.c(REN from src/swfdec-thumbnailer.c), thumbnailer/swfdec-thumbnailer.schemas.in(REN from src/swfdec-thumbnailer.schemas.in)
Log: Rename src to thumbnailer
Traceback (most recent call last):
  File "/home/olav/tmp/tailor/vcpx/target.py", line 117, in replayChangeset
    self._replayChangeset(changeset)
  File "/home/olav/tmp/tailor/vcpx/target.py", line 320, in _replayChangeset
    action(group)
  File "/home/olav/tmp/tailor/vcpx/target.py", line 489, in _renameEntries
    self._renamePathname(e.old_name, e.name)
  File "/home/olav/tmp/tailor/vcpx/repository/svn.py", line 780, in _renamePathname
    err.read()))
ChangesetApplicationFailure: /home/olav/src/tailor/output $ svn mv --quiet --force src/swfdec-thumbnailer.schemas.in thumbnailer/swfdec-thumbnailer.schemas.in 2>&1 returned status 1 saying
svn: 'src/swfdec-thumbnailer.schemas.in' is not under version control

00:47:59 [C] Couldn't replay changeset
00:47:59 [C] Upstream change application failed
Failure applying upstream changes: /home/olav/src/tailor/output $ svn mv --quiet --force src/swfdec-thumbnailer.schemas.in thumbnailer/swfdec-thumbnailer.schemas.in 2>&1 returned status 1 saying
svn: 'src/swfdec-thumbnailer.schemas.in' is not under version control

This is caused by incorrectly adding files to SVN in changeset 9:

22:11:18 [I] Changeset #9
22:11:18 [I] Changeset "09a4609f3619e4516cd9a2f5b924d80cdb457995"
22:11:18 [I] Log message: Forgot to add some files
22:11:18 [I] /home/olav/src/tailor/output $ git merge -n --no-commit fastforward HEAD 09a4609f3619e4516cd9a2f5b924d80cdb457995
22:11:18 [I] [Ok]
Output stream:
Updating 2d9256b..09a4609
Fast forward
22:11:18 [I] /home/olav/src/tailor/output $ svn add --quiet --no-auto-props --non-recursive po/LINGUAS po/POTFILES.in src/swfdec-thumbnailer.schemas.in
svn: 'po' is not a working copy
svn: Can't open file 'po/.svn/entries': No such file or directory
22:11:18 [W] [Status 1]
22:11:18 [I] /home/olav/src/tailor/output $ svn commit --file /home/olav/tmp/tailorf5RAk4svn . 2>&1
22:11:18 [I] [Ok]
22:11:18 [W] svn did not find anything to commit

Not sure if this is due to Git or SVN, so leaving default component.

[bkor]

More readable error message:

22:11:24 [I] /home/olav/src/tailor/output $ svn mv --quiet --force src/swfdec-thumbnailer.schemas.in thumbnailer/swfdec-thumbnailer.schemas.in 2>&1
22:11:25 [W] [Status 1]
Error stream:
svn: 'src/swfdec-thumbnailer.schemas.in' is not under version control
22:11:25 [E] Failure replaying: Revision: e69e0dd1319e1003a30ef936fc6c6fdefcb8c6b7
Date: 2007-10-16 14:16:07+03:00
Author: Pekka Lampila <pekka.lampila@iki.fi>
Entries: Makefile.am(UPD), configure.ac(UPD), m4/as-compiler-flag.m4(DEL), po/POTFILES.in(UPD),
thumbnailer/Makefile.am(REN from src/Makefile.am), thumbnailer/swfdec-thumbnailer.c(REN 
from src/swfdec-thumbnailer.c), thumbnailer/swfdec-thumbnailer.schemas.in(REN from 
src/swfdec-thumbnailer.schemas.in)
Log: Rename src to thumbnailer
Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/vcpx/target.py", line 117, in replayChangeset
    self._replayChangeset(changeset)
  File "/usr/lib/python2.5/site-packages/vcpx/target.py", line 320, in _replayChangeset
    action(group)
  File "/usr/lib/python2.5/site-packages/vcpx/target.py", line 489, in _renameEntries
    self._renamePathname(e.old_name, e.name)
  File "/usr/lib/python2.5/site-packages/vcpx/repository/svn.py", line 780, in _renamePathname
    err.read()))
ChangesetApplicationFailure: /home/olav/src/tailor/output $ svn mv --quiet --force src/swfdec-thumbnailer.schemas.in thumbnailer/swfdec-thumbnailer.schemas.in 2>&1 returned status 1 saying
svn: 'src/swfdec-thumbnailer.schemas.in' is not under version control

22:11:25 [C] Couldn't replay changeset
22:11:25 [C] Upstream change application failed
Failure applying upstream changes: /home/olav/src/tailor/output $ svn mv --quiet --force src/swfdec-thumbnailer.schemas.in thumbnailer/swfdec-thumbnailer.schemas.in 2>&1 returned status 1 saying
svn: 'src/swfdec-thumbnailer.schemas.in' is not under version control

And the changeset #9 part which is the source of the failure:

22:11:18 [I] Changeset #9
22:11:18 [I] Changeset "09a4609f3619e4516cd9a2f5b924d80cdb457995"
22:11:18 [I] Log message: Forgot to add some files
22:11:18 [I] /home/olav/src/tailor/output $ git merge -n --no-commit fastforward HEAD 09a4609f3619e4516cd9a2f5b924d80cdb457995
22:11:18 [I] [Ok]
Output stream:
Updating 2d9256b..09a4609
Fast forward
22:11:18 [I] /home/olav/src/tailor/output $ svn add --quiet --no-auto-props --non-recursive po/LINGUAS po/POTFILES.in src/swfdec-thumbnailer.schemas.in
svn: 'po' is not a working copy
svn: Can't open file 'po/.svn/entries': No such file or directory
22:11:18 [W] [Status 1]
22:11:18 [I] /home/olav/src/tailor/output $ svn commit --file /home/olav/tmp/tailorf5RAk4svn . 2>&1
22:11:18 [I] [Ok]
22:11:18 [W] svn did not find anything to commit