* Nathaniel Smith:
On Sun, May 01, 2005 at 06:51:54PM +0200, Florian Weimer wrote:
* Nathaniel Smith:
Fortunately, it seems like codeville-merge is a viable replacement
here (it can be applied to both content merges and tree rearrangement
merges), and with some recent improvements that
On Mon, 2005-05-02 at 10:48, Timothy Brownawell wrote:
On 5/2/05, Henrik Holmboe [EMAIL PROTECTED] wrote:
Nathaniel Smith [EMAIL PROTECTED] writes:
snip
command-specific-option. For this to be acceptable, though, I think on
drop we'd have to cache the deleted file somewhere, for disaster
In message [EMAIL PROTECTED] on Mon, 2 May 2005 16:25:09 -0700, Nathaniel
Smith [EMAIL PROTECTED] said:
njs On Tue, May 03, 2005 at 01:21:31AM +0200, Florian Weimer wrote:
njs I think Nathaniel wanted to say that there is an implied conflict
njs which 3-way merge cannot detect, not that one
On Tue, May 03, 2005 at 01:31:48AM +0200, Florian Weimer wrote:
Yes, it's possible for two people to make redundant changes. This is
one reason why it's impossible define a merge algorithm that works for
all the various I's one might like. Given that, then, the
responsibility of a merge
0.19 source package now available at:
http://venge.net/monotone/downloads/monotone-0.19.tar.gz
Official announcement in a bit (possibly after I wake up), but if you
normally provide binary packages (you know who you are ;-)), or would
like to provide a package for something besides the usual
