Ticket #41 (closed defect: worksforme)

Opened 7 years ago

Last modified 7 years ago

problems converting svn -> bzr when files have been deleted in subversion repository

Reported by: a.mino@… Owned by: lele
Priority: major Milestone: VersionOne
Component: tailor Version: 0.9
Keywords: Cc:

Description

I'm trying to tailorize the  Griffith SVN repository into bzr format, but I get breakage on upstream changeset 15 :

23:46:24 [I] Updating "griffith" in "/home/murdos/tmp/tests-griffith/basedir/griffth.svn"
23:46:25 [I] Applying pending upstream changesets
23:46:25 [I] Changeset "15"
23:46:25 [I] Log message: Updated some old CVS stuff
23:46:25 [I] /home/murdos/tmp/tests-griffith/basedir/griffth.svn $ svn update --revision 15 .
23:46:29 [I] [Ok]
23:46:29 [I] Removing data/export_templates/table/styles/CVS...
23:46:29 [E] Failure replaying: Revision: 15
Date: 2005-10-13 16:11:23.597070
Author: piotrek
Modified: README,TODO,debian/changelog,docs/en/griffith.1,docs/en/griffith.xml,docs/pl/griffith.1,docs/pl/griffith.xml,lib/version.py
Removed: data/export_templates/table/styles/CVS
Log: Updated some old CVS stuff
Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 297, in _replayChangeset
    if removed: self._removeEntries(removed)
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 380, in _removeEntries
    self._removePathnames([e.name for e in entries])
  File "/usr/lib/python2.4/site-packages/vcpx/bzr.py", line 195, in _removePathnames
    self._b.working_tree().remove(entries)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 89, in decorated
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/workingtree.py", line 846, in remove
    raise NotVersionedError(path=f)
NotVersionedError: data/export_templates/table/styles/CVS is not versioned
23:46:29 [E] Couldn't reply changeset
Revision: 15
Date: 2005-10-13 16:11:23.597070
Author: piotrek
Modified: README,TODO,debian/changelog,docs/en/griffith.1,docs/en/griffith.xml,docs/pl/griffith.1,docs/pl/griffith.xml,lib/version.py
Removed: data/export_templates/table/styles/CVS
Log: Updated some old CVS stuff
Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/vcpx/source.py", line 133, in applyPendingChangesets
    replay(c)
  File "/usr/lib/python2.4/site-packages/vcpx/dualwd.py", line 106, in replayChangeset
    self.target.replayChangeset(changeset)
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 297, in _replayChangeset
    if removed: self._removeEntries(removed)
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 380, in _removeEntries
    self._removePathnames([e.name for e in entries])
  File "/usr/lib/python2.4/site-packages/vcpx/bzr.py", line 195, in _removePathnames
    self._b.working_tree().remove(entries)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 89, in decorated
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/workingtree.py", line 846, in remove
    raise NotVersionedError(path=f)
NotVersionedError: data/export_templates/table/styles/CVS is not versioned
23:46:29 [C] Upstream change application failed
Traceback (most recent call last):
  File "/usr/bin/tailor", line 33, in ?
    main()
  File "/usr/lib/python2.4/site-packages/vcpx/tailor.py", line 332, in main
    tailorizer()
  File "/usr/lib/python2.4/site-packages/vcpx/tailor.py", line 145, in __call__
    self.update()
  File "/usr/lib/python2.4/site-packages/vcpx/tailor.py", line 108, in update
    last, conflicts = dwd.applyPendingChangesets(
  File "/usr/lib/python2.4/site-packages/vcpx/dualwd.py", line 96, in applyPendingChangesets
    applied=applied)
  File "/usr/lib/python2.4/site-packages/vcpx/source.py", line 133, in applyPendingChangesets
    replay(c)
  File "/usr/lib/python2.4/site-packages/vcpx/dualwd.py", line 106, in replayChangeset
    self.target.replayChangeset(changeset)
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 112, in replayChangeset
    self._replayChangeset(changeset)
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 297, in _replayChangeset
    if removed: self._removeEntries(removed)
  File "/usr/lib/python2.4/site-packages/vcpx/target.py", line 380, in _removeEntries
    self._removePathnames([e.name for e in entries])
  File "/usr/lib/python2.4/site-packages/vcpx/bzr.py", line 195, in _removePathnames
    self._b.working_tree().remove(entries)
  File "/usr/lib/python2.4/site-packages/bzrlib/branch.py", line 89, in decorated
    return unbound(self, *args, **kwargs)
  File "/usr/lib/python2.4/site-packages/bzrlib/workingtree.py", line 846, in remove
    raise NotVersionedError(path=f)
bzrlib.errors.NotVersionedError: data/export_templates/table/styles/CVS is not versioned

I'm using the following versions :

  • tailor 0.9.20
  • bzr 0.7
  • subversion 1.2.3 (r15833)

And thanks for your awesome work !

Change History

comment:1 Changed 7 years ago by a.mino

I've forgotten: I'm using this config file:

#!
"""
[DEFAULT]
verbose = True
projects = griffith
encoding = utf-8

[griffith]
target = bzr:target
start-revision = INITIAL
root-directory = basedir/griffth.svn
state-file = tailor.state
source = svn:source
subdir = .
#before-commit = remap_author
patch-name-format =

[bzr:target]
encoding = utf-8

[svn:source]
module = /griffith
repository = http://svn.berlios.de/svnroot/repos/griffith
encoding = utf-8
trust-root = yes
"""

comment:2 Changed 7 years ago by lele

  • Status changed from new to closed
  • Resolution set to worksforme

Seems to be working great with current tailor (so bzr 0.8). Please report back if not.

Note: See TracTickets for help on using tickets.