Concerning Tree conflict after a simple delete
Giulio Troccoli wrote on 23 Sep 2009, 11:09, at least in part:
> I don't understand why I have a tree conflict on icudcc31.c. The
> message say "local edit" but the file hasn't been changed, as the
> first svn st command showed.
>
> I have seen other posts in the ML regarding unexpected tree conflicts
> but they are usually about deleting of directories not files, or
> merging a delete twice in both directions (from trunk to branch and
> then from branch to trunk), or renaming/moving a file. Now I know this
> last case is similar to mine, as that it's just a delete and an add in
> Subversion, but, well, it should work :-)
>
> I have tried, and still am, to write a script that replicates the
> problem but without knowing why this is happening it turns out a not
> so easy task.
>
> Anyone can help?
No help, but maybe it can confirm that there is something
happening and probably give a further hint to narrow things down:
On spurious occasions I notice on svn updates that files knowingly
not modified locally are reported as "merged". It can't be property
edits as these are done very rarely here and then I would know
about them.
Even more spuriously merge conflicts happen on files not modified
locally at all. The *mine* section then is identical to what BASE
has. No branching involved.
So no recipe on my side either, but it makes me wonder ...
Currently SVN is 1.5.7 on W2K/XP, but I suppose it also has
happened before with 1.4 or something.
JH
---------------------------------------
Freedom quote:
The price of freedom is eternal vigilance.
-- Thomas Jefferson
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398840
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-23 13:45:45 CEST