On Wed, Aug 24, 2005 at 09:38:07AM +0200, Christof Petig wrote: > and resolving the first two conflicting files by hand (select third > wherever necessary) I get this error. Since I did not mess with file > renaming ... (perhaps the fact that I added/changed a file to/in the now > removed netxx/ directory is the problem? *)
Can we get a --dump? That should contain the inconsistent changesets in question, which should give us some idea of where in particular the problem is... > *) This would lead to the conclusion that removing the added file > (md5sum) in netxx/ might solve my problem ... I'll try that later this week. Possibly. -- Nathaniel -- The Universe may / Be as large as they say But it wouldn't be missed / If it didn't exist. -- Piet Hein _______________________________________________ Monotone-devel mailing list Monotone-devel@nongnu.org http://lists.nongnu.org/mailman/listinfo/monotone-devel
