subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Andreas Krey <>
Subject Re: Tree Conflicts with Subversion 1.7
Date Mon, 22 Aug 2011 11:59:45 GMT
On Mon, 22 Aug 2011 12:49:25 +0000, Stefan Sperling wrote:
> > I'm used to manual merges, which means its always (p) with me. Which
> > unfortunately does not work quite well with properties, as far I
> > remember.
> Can you provide details? What doesn't work, exactly?
> Is there already an issue filed for this problem?

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.

> > One thing that would be helpful is (!): Run a shell.
> I agree that would be nice.
> However, right now, svn opens the prompt while the TCP connection
> to the server is still open.

And you think I can't open a new shell or ^Z the merge? 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).

> It's not going to be mandatory. It will be an optional helper,
> just like the current interactive conflict resolution prompt.

Good. Even the presentation of what exactly will be committed will
be interesting.


"Totally trivial. Famous last words."
From: Linus Torvalds <torvalds@*.org>
Date: Fri, 22 Jan 2010 07:29:21 -0800

View raw message