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

Re: [Issue 2784] New - Add option to resolve conflicts by selecting a specific file

From: Jeremy Whitlock <jcscoobyrs_at_gmail.com>
Date: 2007-05-23 21:05:57 CEST

Hi All,
    I have assigned the issue to me and marked it as "STARTED" per Karl's
request. I have also added a comment to the issue to give an idea of how I
will be tackling this. Please feel free to provide any insight, concerns
and/or questions as necessary.

Take care,

Jeremy

On 5/23/07, Daniel Rall <dlr@collab.net> wrote:
>
> On Wed, 23 May 2007, Karl Fogel wrote:
>
> > "Jeremy Whitlock" <jcscoobyrs@gmail.com> writes:
> > > Before someone else takes this and runs with it, I would like to
> > > work on this. I'll look into the source to formulate a plan and then
> > > I will send this to you all for review before working on any code.
> > > How does this sound?
> >
> > Typical way to do this is to go into the tracker and assign the issue
> > to yourself, mark it as "STARTED", and then go to work.
> >
> > This is a small enough change that I don't think you need to wait
> > before starting to work on the code. It's fine to send an overview of
> > your plan here, of course, but don't get too hung up on waiting for
> > feedback -- anyway, going down the wrong path would be educational, so
> > it's not like you can waste time.
>
> Jeremy and I were just discussing how to get started writing a test.
> I suggested that he refactor the conflict creation code housed in the
> basic_conflict() routine in subversion/tests/cmdline/basic_tests.py
> into a helper function, and add a new test to exercise 'resolved
> --accept=WHICH' to either basic_tests.py or merge_tests.py, using the
> new helper routine.
>
> - Dan
>
>
Received on Wed May 23 21:06:10 2007

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