Re: [Monotone-devel] How to resolve this non-content conflict?

[jack-monotone]

On Fri, Jun 06, 2008 at 02:52:31PM -0700, Jeff Rizzo wrote:
 
> I just ran into an issue that I'm not sure how to resolve - I'm using 
> merge_into_dir to assemble a "production" branch for a website out of a 
> combination of vendor and in-house code.  The vendor branch tracks 
> software releases of a popular web package, and we have a couple 
> branches of house code that have been merge_into_dir(ed) to directories 
> under the vendor software.

.. and you've found the problem with monotone and this approach. 

... snip ... 

> mtn: conflict: orphaned file 'wp-content/themes/default/image.php' from 
> revision ef792acd2030ad751d160de5345358845b7a374c
> mtn: parent directory 'wp-content/themes/default' was deleted on the right
> mtn: file 'wp-content/themes/default/image.php' was added on the left
> mtn: error: merge failed due to unresolved conflicts
 
> Thoughts?  More info needed?

What has happened is that on your production branch, someone dropped a
directory. And then on your vendor branch, someone added a file
('wp-content/themes/default/image.php') into that directory. 

Now, when you propagate the vendor branch to the production branch, monotone
doesn't know what to do with the file. 

So, what you need to do is drop that file in the vendor (or intermediate)
branch, and then propagate again. 

In this case, it'd be nice if monotone threw the orphaned files into a
/lost+found directory, and issue a warning. 

--Jack 

--
Jack (John) Cummings                           http://mudshark.org/
PGP fingerprint: F18B 13A3 6D06 D48A 598D  42EA 3D53 BDC8 7917 F802