On Tue, Oct 05, 2010 at 11:45:18AM -0700, David O'Brien wrote:
> On Wed, Sep 22, 2010 at 08:07:52PM +0200, Stefan Sperling wrote:
> > On Wed, Sep 22, 2010 at 07:52:46AM -0700, David O'Brien wrote:
> > > http://subversion.tigris.org/issues/show_bug.cgi?id=890
> ..
> > However, the patch needs some work. I suppose it has not been synced
> > to Subversion trunk yet, so that will need to be done.
> > Would you be willing to do this?
>
> Hi Stefan,
> Yes, I will look into doing that. As you mention below, the patch is
> still using the 1.6 API and I don't believe anyone has looked at what
> it will take to use the 1.7 API.
>
> Thank you for pointing out various things about the APIs used in the
> patch. That is a big help.
Ok, I'll wait for an updated patch, then. Thank you!
> > > diff -ruN subversion/libsvn_wc/merge.c subversion/libsvn_wc/merge.c
> > > --- subversion/libsvn_wc/merge.c 2009-02-16 23:35:25.000000000 +0300
> > > +++ subversion/libsvn_wc/merge.c 2009-04-03 22:11:01.307500000 +0400
> > > @@ -369,7 +369,7 @@
> > > target_marker,
> > > right_marker,
> > > "=======", /* separator */
> > > - svn_diff_conflict_display_modified_latest,
> > > + svn_diff_conflict_display_modified_original_latest,
> >
> > The above change looks unrelated to issue #890.
>
> Correct. Should an issue be raised for this?
I don't know if there already is an issue related to custom
conflict markers. If you cannot find one, feel free to file one.
> The API support various conflict markers, but I can find no way to
> configure the svn client on which to use. Thus we have to patch the
> code directly as we've chose "Perforce"-style markers as being most
> useful to our community (both FreeBSD and $WORK).
>
> I wonder if with 1.7 it wouldn't be a good point to change the default?
I'd rather add configuration options than changing the default.
> > > + * Since we're adding freebsd-specific tokens to the log message,
> > > + * clean out any leftovers to avoid accidently sending them to other
> > > + * projects that won't be expecting them.
> > > + */
> > > +
> > > +#define NPREFIX 7
> > > +char *prefixes[NPREFIX] = {
> > > + "PR:",
> ..
> > Your log message template changes are interesting but unrelated to issue #890.
> > The related issue would be:
> > http://subversion.tigris.org/issues/show_bug.cgi?id=1973
>
> Correct -- it is my understanding this issue is already being worked on
> for a future version of Subversion. I fully acknowledge this change is
> not generic and not suitable for inclusion in the stock Subversion.
The request is being tracked, but that doesn't imply that anyone is
working on it. I don't know if anyone is actively working on this.
> I have had to make a similar change at $WORK as many folks depend on the
> template to remind them the various markers we put in our log messages.
>
> So the feature is a highly desired one from the two communities I am
> most active in.
Feel free to work towards a more generic solution, if you have the time
to spare.
I suppose it would help if a design discussion was started on this
mailing list before any actual coding is done. It's important to make
sure the svn community agrees with the approach before doing any serious work.
This is usually low overhead if the design proposal is well thought out.
Usually the design, no matter how good it already is, benefits a lot from
community discussion. Also, you can regard developers involved in the
discussion as potential candidates for reviewing related patches :)
Thanks,
Stefan
Received on 2010-10-06 16:44:27 CEST