You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Alan Barrett <ap...@cequrux.com> on 2007/12/14 12:25:43 UTC
Re: Unexpected behavior in (d)iff while interactively working
through conflicts--I think diff3 would be nicer
On Thu, 13 Dec 2007, Ben Collins-Sussman wrote:
> > +<<<<<<< .mine
> > +moona
> > +=======
> > +bar
> > +>>>>>>> .r2
> >
> > What I got was diff2 output, while what I expected was diff3 output.
> What exactly would diff3 output look like?
I think he means this:
<<<<<<< .mine
moona
||||||| .r1
foo
=======
bar
>>>>>>> .r2
Both the existing format and the format that I think is wanted are
produced by the traditional diff3 program. The existing format looks
like the output from "diff3 -m -E .mine .r1 .r2", while the desired
format is more like the output from "diff3 -m -A .mine .r1 .r2".
--apb (Alan Barrett)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Unexpected behavior in (d)iff while interactively working through conflicts--I think diff3 would be nicer
Posted by "Brian W. Fitzpatrick" <fi...@red-bean.com>.
On Dec 14, 2007 11:51 AM, David Glasser <gl...@davidglasser.net> wrote:
> The current output, the first time you run (d)iff (ie, assuming you
> haven't edited the merged file yourself) is essentially diff2(r1,
> diff3(mine, r1, r2)).
Correct. And that makes me dizzy.
-Fiz
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Re: Unexpected behavior in (d)iff while interactively working through conflicts--I think diff3 would be nicer
Posted by David Glasser <gl...@davidglasser.net>.
On Dec 14, 2007 4:25 AM, Alan Barrett <ap...@cequrux.com> wrote:
> On Thu, 13 Dec 2007, Ben Collins-Sussman wrote:
> > > +<<<<<<< .mine
> > > +moona
> > > +=======
> > > +bar
> > > +>>>>>>> .r2
> > >
> > > What I got was diff2 output, while what I expected was diff3 output.
> > What exactly would diff3 output look like?
>
> I think he means this:
>
> <<<<<<< .mine
> moona
> ||||||| .r1
> foo
> =======
> bar
> >>>>>>> .r2
>
> Both the existing format and the format that I think is wanted are
> produced by the traditional diff3 program. The existing format looks
> like the output from "diff3 -m -E .mine .r1 .r2", while the desired
> format is more like the output from "diff3 -m -A .mine .r1 .r2".
I agree with you about what the desired format is, but I think you're
mischaracterizing the current output.
The current output, the first time you run (d)iff (ie, assuming you
haven't edited the merged file yourself) is essentially diff2(r1,
diff3(mine, r1, r2)).
--dave
--
David Glasser | glasser@davidglasser.net | http://www.davidglasser.net/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org