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

Re: svn status doesn't show a conflict

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2006-07-03 21:09:33 CEST

On 7/3/06, Garrett Rooney <rooneg@electricjellyfish.net> wrote:
> On 7/3/06, Garrett Rooney <rooneg@electricjellyfish.net> wrote:
> > On 7/3/06, Erik Huelsmann <ehuels@gmail.com> wrote:
> >
> > > My thoughts would be that C should prevail, yes.
> >
> > Ok, works for me. I've got a patch here with a fix + test that I'm
> > ready to commit, just waiting for the tests to finish running, then
> > I'll check it in.
>
> Committed in r20382. Erik, if you could take a look I'd appreciate it.

Looks good. Thanks for the prompt response. (Proposing for backport?)

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jul 3 21:11:08 2006

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