Ticket #24 (closed defect: fixed)
tailor fails to apply changeset 193 of typo.leetsoft.com correctly
| Reported by: | anonymous | Owned by: | lele |
|---|---|---|---|
| Priority: | major | Milestone: | VersionOne |
| Component: | tailor | Version: | 0.9 |
| Keywords: | Cc: |
Description
Tailorizing the svn repo typo.leetsoft.com fails to apply changeset 193 when started from revision =< 171. If started from 172 or later (but before 193 of course) the same changeset is applied correctly.
tailor --verbose --debug --configfile=typo.bzr.tailor 16:17:35 [I] Bootstrapping "project" in "/home/bart/tmp/typo.new" 16:17:35 [I] Initializing new repository in "/home/bart/tmp/typo.new"... 16:17:35 [I] $ svn ls svn://leetsoft.com/typo branches/ tags/ trunk/ 16:17:44 [I] [Ok] 16:17:44 [I] $ svn ls svn://leetsoft.com svn: No repository found in 'svn://leetsoft.com' 16:17:46 [W] [Status 1] 16:17:46 [I] $ svn co --quiet --revision 171 svn://leetsoft.com/typo/trunk /home/bart/tmp/typo.new 16:17:58 [I] [Ok] 16:17:58 [I] /home/bart/tmp/typo.new $ svn log --verbose --xml --revision 171 [snip] 16:20:04 [I] /home/bart/tmp/typo.new $ svn update --revision 193 . 16:20:07 [I] [Ok] Output stream: U db/schema.mysql.sql U db/schema.psql.sql U db/schema.sqlite.sql U README D README_LOGIN Updated to revision 193. 16:20:07 [I] _replayChangeset: changeset= README UPD db/schema.mysql.sql UPD db/schema.psql.sql UPD db/schema.sqlite.sql UPD 16:20:07 [I] Committing "[project @ 193]"... 16:20:07 [I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* 16:20:07 [I] Changeset "194" .....
Note how in the above output, the file README_LOGIN is listed as deleted in the output stream of svn changeset 193 but that the same file isn't listed in the tailor changeset (reporting the files in the tailor changeset is mine). The README_LOGIN file was added in revision 172.
When starting at revision 172, changeset 193 does get applied correctly as the following log shows.
tailor --verbose --debug --configfile=typo.bzr.tailor 16:09:38 [I] Bootstrapping "project" in "/home/bart/tmp/typo.new" 16:09:41 [I] Initializing new repository in "/home/bart/tmp/typo.new"... 16:09:41 [I] $ svn ls svn://leetsoft.com/typo svn: Can't connect to host 'leetsoft.com': Connection timed out 16:13:04 [W] [Status 1] 16:13:04 [I] $ svn ls svn://leetsoft.com svn: No repository found in 'svn://leetsoft.com' 16:13:05 [W] [Status 1] 16:13:05 [I] $ svn co --quiet --revision 172 svn://leetsoft.com/typo/trunk /home/bart/tmp/typo.new 16:13:19 [I] [Ok] 16:13:19 [I] /home/bart/tmp/typo.new $ svn log --verbose --xml --revision 172 [snip] 16:15:08 [I] /home/bart/tmp/typo.new $ svn update --revision 193 . 16:15:12 [I] [Ok] Output stream: U db/schema.mysql.sql U db/schema.psql.sql U db/schema.sqlite.sql U README D README_LOGIN Updated to revision 193. 16:15:12 [I] _replayChangeset: changeset= README UPD README_LOGIN DEL db/schema.mysql.sql UPD db/schema.psql.sql UPD db/schema.sqlite.sql UPD 16:15:12 [I] Removing README_LOGIN... 16:15:12 [I] Committing "[project @ 193]"... 16:15:14 [I] -*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-* 16:15:14 [I] Changeset "194" ...
Change History
comment:2 Changed 7 years ago by bartt
str(changeset) wasn't enough because it didn't clearly report what type of change (UPD, DEL, ..) would be applied for each file in the changeset.
comment:3 Changed 7 years ago by bartt
Tailor config file for this conversion:
[DEFAULT] verbose = True [project] target = bzr:target start-revision = INITIAL root-directory = /tmp/typo.bzr state-file = tailor.state source = svn:source subdir = . [bzr:target] [svn:source] module = /trunk repository = svn://leetsoft.com/typo

Uhm, I cannot see what could interfere here... I shall try out the conversion myself and dig a little. BTW, why wasn't str(changeset) enough for debugging purposes?