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

Re: svn_wc_conflict_result_choose_repos found dangerous?

From: Erik Huelsmann <ehuels_at_gmail.com>
Date: 2007-07-18 13:09:17 CEST

On 7/18/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> On 7/17/07, Mark Phippard <markphip@gmail.com> wrote:
> > On 7/17/07, Ben Collins-Sussman <sussman@red-bean.com> wrote:
> > > Aw, crud, you guys are right. I need to fix that. When perforce
> > > prompts you whether you want to "choose mine or theirs", it's
> > > referring to conflicting hunks, not the entire file. Gah.
> > >
> > > Thanks for pointing this out.
> >
> > Just to be clear, I do not think it needs to prompt hunk by hunk, it
> > would be fine if it simply used your choice for the hunks where it
> > encounters conflicts.
> >
> > I'd imagine binary files would have to work the way you have it right now.
> >
>
> I agree 100%. In the case where the 'merged' file doesn't exist (i.e.
> binary files), selecting mine/theirs would choose the entire file.
> But if a 'merged' file does exist, we need to scan the file, detect
> conflict markers, and select one side of the hunk.

Aren't they just 2 different use-cases ('select-theirs-entirely' or
'select-theirs-hunk-wise')?

bye,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 18 13:08:27 2007

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