Re: performance enhancement by working copy svn server

On Thu, Apr 10, 2008 at 07:55:45PM -0700, Peter Wemm wrote:
> On the 3-way merge stuff.. In perforce, the format is like this:
>
> >>> original
> orig
> === theirs
> their version
> --- yours
> your version
> <<<
>
> In svn, by default, you don't get to see the original text (just like cvs):
> <<<<<<< .mine
> your version
> =======
> their version
> >>>>>>> .r2
>
> With a 1-line change, you can sort-of get the p4-like semantics:
> <<<<<<< .mine
> your version
> ||||||| .r1
> orig
> =======
> their change
> >>>>>>> .r2
>
> libsvn_wc/merge.c, in the call for svn_diff_file_output_merge():
> - FALSE, /* display original */
> + TRUE, /* display original */

Wheee! Shouldn't we make this a new configurable option in 1.6?

-- 
Stefan Sperling <stsp_at_elego.de>                    Software Monkey
 
German law requires the following banner :(
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                               CEO: Olaf Wagner
 
Store password unencrypted (yes/no)? No