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

Re: [PATCH] for 3262 Re: 1.5.5 next Wednesday (12/17)

From: Steve Suehs <csuehs_at_drillinginfo.com>
Date: Thu, 11 Dec 2008 15:03:12 -0600

Thanks. We would really appreciate it. Right now, I'm the merge gimp
for the company because I'm the only one with a patched svn client.

We have multiple teams running into this, and I'm the only one who can
merge for them. While we are implementing a commit hook to prevent
further introduction of inconsistent eol's, we're still stuck with about
3 teams (5 branches) with the problem, both merging trunk out to branch
and just now, merging back into trunk.

I don't like being the merge gimp. I have other things to do.

-s

On Thu, 2008-12-11 at 12:56 -0800, David Glasser wrote:
> If that gets nominated, I'll vote for it (it was my patch), but I seem
> to recall failing to get anybody interested in reviewing it when I
> submitted it as a patch pre-commit, let alone backport review.
>
> --dave
>
> On Thu, Dec 11, 2008 at 11:54 AM, Steve Suehs <csuehs_at_drillinginfo.com> wrote:
> > http://subversion.tigris.org/issues/show_bug.cgi?id=3262
> >
> >
> > --- subversion/libsvn_wc/merge.c (revision 34661)
> > +++ subversion/libsvn_wc/merge.c (working copy)
> > @@ -245,7 +245,7 @@
> > pool));
> > SVN_ERR(svn_subst_copy_and_translate3(old_target,
> > tmp_new,
> > - eol, eol ? FALSE : TRUE,
> > + eol, TRUE,
> > NULL, FALSE,
> > FALSE, pool));
> >
> >
> > On Wed, 2008-12-10 at 10:58 -0800, Hyrum K. Wright wrote:
> >> 1.5.x STATUS is still pretty full, but I'm going to move forward with plans to
> >> roll 1.5.5 next Wednesday, Dec. 17. What's been merged by that time will be
> >> what's in the release, so if there are items in STATUS you want in the release,
> >> poke, prod, campaign or bribe people to vote on them.
> >>
> >> -Hyrum
> >>
> >> ------------------------------------------------------
> >> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=982393
> >
> > ------------------------------------------------------
> > http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=983006
> >
>
>
>

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=983035
Received on 2008-12-11 22:04:47 CET

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