Re: Tree conflict after a simple delete

Giulio Troccoli wrote:
> The message say "local edit" but the file hasn't been changed, as the first svn st command showed.

The st command only shows that nothing happened in the working copy. "local
edit" also covers edits committed earlier in the branch you're merging into.

The branch you're merging from now was copied at some point. In the copy the
file was deleted (perhaps renamed), in the original the file was edited.
That's a conflict all right.

How can you see when that "local edit" happened? I don't know an easier
answer than this:
  - look up the revision the branch was copied from
  - get the log for the conflicted file from that revision to HEAD

-- 
Stein
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2398822
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].