On 9/8/06, dlr@tigris.org <dlr@tigris.org> wrote:
> Author: dlr
> Date: Fri Sep 8 14:49:48 2006
> New Revision: 21384
>
> Log:
> Fix issue #2584, correcting two problems:
>
> 1) A merge which results in a conflicted file in your WC should
> produce a "conflicted" merge notification.
>
> 2) 'svn merge --dry-run' needs to be smarter about accessing the
> working copy.
>
> While #1 is completely fixed, #2 will need some additional work to
> handle some edge cases for directories deletions/additions.
Nice work Dan! (For what it's worth, it's nice of Dan to credit me on
this, but he did all the heavy lifting, I just pointed him in the
right direction.)
One thing that did occur to me while I was reading this is that there
are other potential edge cases we should worry about. Perhaps not
right now, but with the merge tracking work we're going to be seeing
merges that come in multiple waves, where part A could add a file, and
B could perhaps add it again (say because the middle portion, which
was elided because it was already merged, deleted it), so we might
need to worry about things other than deletes.
Anyway, not something to worry so much about now I think, but
something to think about in the future.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Sep 11 16:50:13 2006