Re: Tree conflict merry-go-round on update/switch

On Wed, Nov 26, 2008 at 2:30 PM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
>> Indeed. And the idea sounds so [notes/tree-conflicts/scratch-pad.txt]
>> familiar, even... ;-)
>
> This idea is right except for the "diff" aspect.
>
> The Right Way to handle a tree conflict on Update/switch is definitely
> to update the text-base to the new version, and re-schedule the text so
> that "svn resolved" would make it how the user had it before the update.
> It enables the conflict to be resolved without further updating, which
> is the expected behaviour. It is analogous to how proprty and text
> conflicts behave.
>
> In this case (incoming delete), this means we would delete the text-base
> and re-schedule the file as "A +" so its status is reported as "A + C".
>
> "svn diff" would show an all-lines-added diff.

Would it? Given that this is an A+ and not an A then I'd expect to
diff to only show the modifications to the file that differ from the
history part. That is what I've seen in commit emails in the past
when this is done.

Using trunk, if I create this situation by doing svn cp URL WC that is
what I see. No diff output at all when it is A+ and there are no
mods. When there are mods, the diff output shows just the mods.

So I think the idea is still correct as proposed.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org