[Monotone-devel] Re: 0.26 capitalization - propagate problem

[Shawn Samuel]

So Graydon suggested a solution on irc that should work fine. To recap
for anyone else who encounters this:

1) Orphaned node probably means that you deleted a directory in one
   branch and added a file to the deleted dir in the other. Resolve by
   deleting the file or moving it into a valid directory.

2) Target rename conflict means that either the same path was added
   separately in the two branches, or that a file was added in one
   branch and renamed to the same path in the other branch. One file
   or the other needs to be renamed or deleted before propagating.

The basic principle is that these are conflicts which can't be handled
during merge/propagate so you have to go fix them manually before
doing the merge.

** MTN dev suggestions:

1) These error messages *really* should print out the full path of the
   conflicted nodes.
2) Spit out some suggestions like the above ones (ie more verbose than
   "resolve non-content conflicts") as how and why these conflicts need
   to be addressed. 

shawn

On Mon, Jun 12, 2006 at 01:36:21PM -0400, Shawn Samuel wrote:
> 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
>