Re: Tree conflict bug?
From: Stephen Butler <sbutler_at_elego.de>
Date: Thu, 30 Oct 2008 10:40:57 +0100
Quoting "Neels J. Hofmeyr" <neels_at_elego.de>:
>
[...]
>>>> In my example, the edits I made to this file were
See update_tests.py 37-40 ("update should make use of copyfrom
In the second WC, if the new file is added before the old file is
If you include both files in a single commit, you tend not to
HTH,
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: DE163214194 --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org For additional commands, e-mail: dev-help_at_subversion.tigris.orgReceived on 2008-10-30 10:41:13 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.