#36: svn => darcs breakage when upstream file becomes a directory
---------------------------------------+------------------------------------
Reporter: [EMAIL PROTECTED] | Owner: lele
Type: defect | Status: new
Priority: critical | Milestone: VersionOne
Component: tailor | Version: 0.9
Keywords: |
---------------------------------------+------------------------------------
I'm tailorizing the Ruby on Rails SVN repository into darcs format, but I
get breakage on upstream changeset 2587 (big repository...):
{{{
5:51:16 [I] Applying pending upstream changesets
15:51:16 [I] Changeset "2587"
15:51:16 [I] Log message: [EMAIL PROTECTED]: jeremy | 2005-10-14 14:41:24
-0700
move scripts
[EMAIL PROTECTED]: jeremy | 2005-10-14 14:54:48 -0700
remove script/perform and script/process in favor of
script/perform/profile, etc.
15:51:16 [I] /export/home/steve/projects/tailored/upstream/rails $ svn
update --ignore-externals --revision 2587 .
15:51:18 [I] [Ok]
15:51:18 [I] $ rsync --delete --archive --exclude .svn --exclude _darcs
/export/home/steve/projects/tailored/upstream/rails/
/export/home/steve/projects/tailored/rails
15:51:18 [I] [Ok]
15:51:18 [I] /export/home/steve/projects/tailored/rails $ darcs add
--case-ok --not-recursive --quiet railties/bin/perform
railties/bin/perform/benchmark railties/bin/perform/profile
railties/bin/process railties/bin/process/reaper
railties/bin/process/spawner railties/bin/process/spinner
railties/lib/commands/perform/benchmark.rb
railties/lib/commands/perform/profile.rb
15:51:18 [I] [Ok]
15:51:18 [I] /export/home/steve/projects/tailored/rails $ darcs add
--case-ok --recursive --quiet railties/bin/perform
15:51:18 [I] [Ok]
15:51:18 [I] /export/home/steve/projects/tailored/rails $ darcs add
--case-ok --recursive --quiet railties/bin/process
15:51:18 [I] [Ok]
15:51:18 [I] /export/home/steve/projects/tailored/rails $ darcs record
--all --pipe
15:51:19 [W] [Status 1]
15:51:19 [C] Couldn't reply changeset
15:51:19 [C] Upstream change application failed
Failure applying upstream changes:
/export/home/steve/projects/tailored/rails $ darcs record --all --pipe
returned status 1
}}}
The underlying darcs error is this:
{{{
darcs: takeFile ./railties/bin/perform/benchmark-0 in
/export/home/steve/projects/tailored/rails/_darcs/current: inappropriate
type (Not a directory)
}}}
It turns out that './railties/bin/perform' was changed from a file to a
directory in this changeset. "darcs wh -s" in the target repo gives:
{{{
M ./railties/Rakefile -2 +2
R ./railties/bin/perform
A ./railties/bin/perform/benchmark
A ./railties/bin/perform/profile
R ./railties/bin/process
A ./railties/bin/process/reaper
A ./railties/bin/process/spawner
A ./railties/bin/process/spinner
R ./railties/lib/commands/perform.rb
A ./railties/lib/commands/perform/benchmark.rb
R ./railties/lib/commands/perform/benchmarker.rb
A ./railties/lib/commands/perform/profile.rb
R ./railties/lib/commands/perform/profiler.rb
R ./railties/lib/commands/process.rb
M
./railties/lib/rails_generator/generators/applications/app/app_generator.rb
-2 +3
}}}
I'm using the latest tailor source from your darcs repository. Thanks for
the fantastic work on tailor. Let me know if I can provide any more info
on this problem; I'd be happy to help, but don't know enough right now to
submit a patch.
--
Ticket URL: <http://progetti.arstecnica.it/tailor/ticket/36>
Tailor <http://www.darcs.net/DarcsWiki/Tailor>
An inter-VCs changeset exchanger_______________________________________________
Tailor mailing list
[email protected]
http://lists.zooko.com/mailman/listinfo/tailor
