Re: svn commit: r1355692 - in /subversion/trunk/subversion: libsvn_wc/conflicts.c libsvn_wc/conflicts.h libsvn_wc/wc_db.c tests/libsvn_wc/conflict-data-test.c

From: Greg Stein <gstein_at_gmail.com>
Date: Mon, 2 Jul 2012 15:16:22 -0400

On Sat, Jun 30, 2012 at 8:20 AM, Bert Huijben <bert_at_qqmail.nl> wrote:
> Const would be nice, but would give a compile error in all these locations.
>
> conflict__get_conflict() is a static function that return a non const skel
> to allow editing/extending the skel.

Ah. Wasn't sure if you were (later) modifying the skel. In that
case... yeah: non-const.

Thx,
-g
Received on 2012-07-02 21:16:54 CEST

This message: [ Message body ]
Next message: Andrey Paramonov: "[Bug] Should allow to merge into mixed-revision working copy when specifying --ignore-ancestry"
Previous message: Bert Huijben: "RE: svn commit: r1356261 - in /subversion/trunk: build.conf subversion/include/svn_io.h subversion/libsvn_subr/io.c subversion/libsvn_wc/merge.c subversion/tests/libsvn_subr/ subversion/tests/libsvn_subr/io-test.c"
Maybe in reply to: Philip Martin: "Re: svn commit: r1355692 - in /subversion/trunk/subversion: libsvn_wc/conflicts.c libsvn_wc/conflicts.h libsvn_wc/wc_db.c tests/libsvn_wc/conflict-data-test.c"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]