Re: Tree Conflicts with Subversion 1.7

On Mon, Aug 22, 2011 at 01:59:45PM +0200, Andreas Krey wrote:
> It's not bug-worthy. AFAIR, when I (p) a property conflict, I get
> the conflict markers into the property, and at least 'svn diff' does
> not believe that properties (esp. svn:externals) may be multi-line,
> and AFAIR you also just get both versions as a full-file conflict
> in the property value. Doesn't make exactly easy to see what happened.
> (I may also mingle this up with a property conflict after a regular 'svn up'.)
>
> But as I unterstand, at least the multi-line property diffing is going to
> get better.

Yes, this problem has been fixed in 1.7.
http://subversion.apache.org/docs/release-notes/1.7.html#diff-properties

> And you think I can't open a new shell or ^Z the merge?

Of course you can. You can also walk away from the screen and let
it sit there until the connection times out :)

> It would be
> seriously annoying if the merge then died on a timeout (which it may
> just as well on the (e), which incidentally indirectly allows me to
> spawn a shell).

Well, that's what happens right now. I agree that it isn't ideal.
Received on 2011-08-22 14:41:42 CEST