[Monotone-devel] 0.26 capitalization - propagate problem

[Shawn Samuel]

Thanks to everybody for their suggestions - removing and in some
cases, renaming, the files with miscapitalized paths worked fine and
once we did a checkout from that revision, we can update fine.

However, when one dev tried to do a propagate of that change into his
branch where he'd continued to work on the misnamed files, he got the
errors below. 

There doesn't appear to be any documentation for what these errors
mean (or how to debug - node numbers not being meaningful to an
end-user), so I'm looking for any information plus possible ways to
fix these errors.

thanks,
shawn

mtn: [source] 9562d902a1d0b0865432adcd6b1adfe7f03a88ec
mtn: [target] cc646d7d9c28ad322ae12f0f7ac37e19738067d7
mtn: warning: orphaned node conflict on node 12989, dead parent 12910,
name outlookmailinglistapp
mtn: warning: orphaned node conflict on node 13000, dead parent 11534,
name tinymembership.cs
mtn: warning: orphaned node conflict on node 13001, dead parent 11534,
name tinyoutlookcontact.cs
mtn: warning: orphaned node conflict on node 13003, dead parent 12789,
name errorwriter.cs
mtn: warning: orphaned node conflict on node 13004, dead parent 12933,
name CNToolbar2002New.vbp
mtn: warning: orphaned node conflict on node 13005, dead parent 12933,
name CNToolbar2002New.vbw
mtn: warning: orphaned node conflict on node 13006, dead parent 12934,
name MailingListWebService.asmx
mtn: warning: orphaned node conflict on node 13007, dead parent 12934,
name MailingListWebService.cs
mtn: warning: rename target conflict: nodes 13026, 12792, both want
parent 1743, name MailMerge.cs
mtn: warning: resolve non-content conflicts and then try again.
mtn: error: merge failed due to unresolved conflicts