Issue #3209: merge into missing
From: Stephen Butler <sbutler_at_elego.de>
Date: Mon, 16 Feb 2009 15:15:42 +0100
Hi tree conflict fans, and 1.6 fans,
my thoughts, this time regarding a subject on which I'm not
The status of 1.6-blocker #3209 (see r35877):
[[[
The current behavior is inconsistent. A missing file is not treated
The next steps are to determine the desired behavior, adjust the test
* subversion/tests/cmdline/svntest/actions.py
* subversion/tests/cmdline/merge_tests.py
It's been suggested that we shouldn't raise any tree conflicts on
http://svn.haxx.se/dev/archive-2009-02/0264.shtml
I went ahead and implemented this behavior (still testing before
IMHO, it's OK to have no tree conflict here. The user gets a
Summary of conflicts:
And of course the user can't commit without updating to restore
It's a little weird that a missing file is given empty mergeinfo,
Steve
-- Stephen Butler | Software Developer elego Software Solutions GmbH Gustav-Meyer-Allee 25 | 13355 Berlin | Germany fon: +49 30 2345 8696 | mobile: +49 163 25 45 015 fax: +49 30 2345 8695 | http://www.elegosoft.com Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194Received on 2009-02-16 15:16:16 CET |
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.