[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] Re: 0.26 capitalization - propagate problem
From: |
Hugo Cornelis |
Subject: |
Re: [Monotone-devel] Re: 0.26 capitalization - propagate problem |
Date: |
Mon, 12 Jun 2006 13:11:42 -0500 |
A suggestion :
On 6/12/06, Shawn Samuel <address@hidden> wrote:
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.
Considering the case where many files have been added to a directory
that is deleted in a different branch, perhaps there should be a
configurable target directory where to move the added files during the
merge. A value of 'undefined' or something means 'ask the user'.
Hugo
--
Hugo Cornelis Ph.D.
Research Imaging Center
University of Texas Health Science Center at San Antonio
7703 Floyd Curl Drive
San Antonio, TX 78284-6240
Phone: 210 567 8112
Fax: 210 567 8152