Ticket #160 (closed defect: fixed)

Opened 5 years ago

Last modified 5 years ago

monotone -> git problems

Reported by: martijn Owned by: lele
Priority: major Milestone: VersionOne
Component: mtn Version: 0.9
Keywords: Cc:

Description

I had to make the following changes for a monotone -> git transform of the pidgin repository not to fail (so far, I never let it run completely)

There's a timestamp with subsecond precision in the repo, which is why I needed the first bit. I'm not a python person, so I have no idea if the second hunk does what was meant there, but it seemed like it to me, and it gave more progress.

Attachments

tailor-monotone.diff Download (1.2 KB) - added by martijn 5 years ago.
exception.diff Download (28.2 KB) - added by martijn 5 years ago.
output of mtn diff --db /data/devel/monotone-db/pidgin.mtn --revision c63157df1619993a3ca97509ac47fd36c860e713 --revision 9f363ac3ddb1fd5b485104d157695114cefbd987

Change History

Changed 5 years ago by martijn

comment:1 Changed 5 years ago by lele

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

Thank you, I applied the first hunk of the patch, as [1642].

Wrt to the second hunk, I'm sorry but I didn't understand the case, and can't see how your proposal could fix the problem. Please, reopen the ticket if it still fails with latest tailor.

Changed 5 years ago by martijn

output of mtn diff --db /data/devel/monotone-db/pidgin.mtn --revision c63157df1619993a3ca97509ac47fd36c860e713 --revision 9f363ac3ddb1fd5b485104d157695114cefbd987

comment:2 Changed 5 years ago by martijn

Without it (using the debian package of version 0.9.35) I get an exception:

13:00:30 [I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
13:00:30 [I] Changeset #18
13:00:30 [I] Changeset "9f363ac3ddb1fd5b485104d157695114cefbd987"
13:00:30 [I] /data/devel/pidgin.foo $ mtn update --revision 9f363ac3ddb1fd5b485104d157695114cefbd987 2>&1
13:00:42 [I] [Ok]
13:00:42 [I] /data/devel/pidgin.foo $ mtn automate parents 9f363ac3ddb1fd5b485104d157695114cefbd987 --db /data/devel/monotone-db/pidgin.mtn 2>&1
13:00:42 [I] [Ok]
13:00:42 [I] /data/devel/pidgin.foo $ mtn automate certs 9f363ac3ddb1fd5b485104d157695114cefbd987 --db /data/devel/monotone-db/pidgin.mtn 2>&1
13:00:43 [I] [Ok]
13:00:43 [I] /data/devel/pidgin.foo $ mtn diff --db /data/devel/monotone-db/pidgin.mtn --revision c63157df1619993a3ca97509ac47fd36c860e713 --revision 9f363ac3ddb1fd5b485104d157695114cefbd987 2>&1
13:00:48 [I] [Ok]
13:00:50 [I] 5837 pending changesets in state file
13:00:50 [C] Upstream change application failed
13:00:50 [C] Something unexpected!
Traceback (most recent call last):
  File "/var/lib/python-support/python2.5/vcpx/tailor.py", line 154, in __call_
    self.update()
  File "/var/lib/python-support/python2.5/vcpx/tailor.py", line 118, in update
    applyable=self._applyable, applied=self._applied)
  File "/var/lib/python-support/python2.5/vcpx/dualwd.py", line 102, in applyPendingChangesets
    applied=applied)
  File "/var/lib/python-support/python2.5/vcpx/source.py", line 113, in applyPendingChangesets
    res = self._applyChangeset(c)
  File "/var/lib/python-support/python2.5/vcpx/repository/monotone.py", line 821, in _applyChangeset
    mtr.updateCset( changeset )
  File "/var/lib/python-support/python2.5/vcpx/repository/monotone.py", line 692, in updateCset
    self.diffparser.convertDiff(chset)
  File "/var/lib/python-support/python2.5/vcpx/repository/monotone.py", line 543, in convertDiff
    if chentry == None:
  File "/var/lib/python-support/python2.5/vcpx/changes.py", line 65, in __eq__
    return (self.name == other.name and
AttributeError: 'NoneType' object has no attribute 'name'

I'll attach the diff it is parsing, hopefully that will help you test it.

comment:3 Changed 5 years ago by lele

Ok, thank you for the additional info: I think that is fixed too, by [1643].

Note: See TracTickets for help on using tickets.