[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] resolving name conflicts; implementation issues
From: |
Stephen Leake |
Subject: |
Re: [Monotone-devel] resolving name conflicts; implementation issues |
Date: |
Sun, 29 Jun 2008 08:34:59 -0400 |
User-agent: |
Gnus/5.1008 (Gnus v5.10.8) Emacs/22.2 (windows-nt) |
Stephen Leake <address@hidden> writes:
> Hmm. Maybe the presence of an explicit revision in the update command
> line is enough to decide which algorithm to choose; if no explicit
> rev, use full tree, otherwise use synthetic tree. I'll try that.
This works; it allows all current tests to pass, and does what is
needed for the resolve_duplicate_name_conflict suture case.
--
-- Stephe