[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [PATCH] Change label strings in svn up to match svn diff

From: Gabriela Gibson <gabriela.gibson_at_gmail.com>
Date: Mon, 01 Apr 2013 01:20:37 +0100

On 31/03/13 00:39, Daniel Shahaf wrote:
> Gabriela Gibson wrote on Sat, Mar 30, 2013 at 21:31:31 +0000:

> Code inspection tells me that oldrev_str can become the @a suffix
> parameter to the svn_io_open_uniquely_named() call in
> preserve_pre_merge_files(), in which case [\t ()] are all inappropriate
> characters.
> I assume the "label" you refer to is the text following the
> <<<<<</======/>>>>>> conflict markers?
I was trying to change the label for the working copy in a 3-way merge
to show the relative file path.

Take 2 below:


Change "mine_label" passed to external diff3-cmd to list relative
path of file.

* subversion/include/svn_io.h
   (svn_io_run_diff3_4): Fix comment, re-version function.
   (svn_io_run_diff3_3): Change comment to reflect deprecation.

* subversion/libsvn_subr/deprecated.c
   (svn_io_run_diff3_3): Move function from io.c.

* subversion/libsvn_subr/io.c
   (svn_io_run_diff3_3): Move function to deprecated.c.
   (svn_io_run_diff3_4): Add parameter for use in "mine_label".

* subversion/libsvn_wc/merge.c
   (do_text_merge_external): Add new parameter.


Received on 2013-04-01 02:20:44 CEST

This is an archived mail posted to the Subversion Dev mailing list.