ediff

ediff

[Sean Sieger]

How do I create a patch using Ediff?

I've looked through the Ediff manual many times and I don't see it.

Re: ediff

[Sebastien Le Maguer]

Hello,

a patch is only a diff file. So, if you know how to generate a diff file 
you know how to generate a patch.

Sebastien

Sean Sieger a écrit :
> How do I create a patch using Ediff?
>
> I've looked through the Ediff manual many times and I don't see it.
>
>
>
>   

Re: ediff

[Sean Sieger]

Sebastien Le Maguer <Sebastien.Le_Maguer@irisa.fr> writes:

    a patch is only a diff file. So, if you know how to generate a diff
    file you know how to generate a patch.

Right?  And I can do

diff -u a/FILENAME b/FILENAME > FILENAME.patch

and get that file. Is that what you mean?  Or can I, as I was trying to
verbalize in my original post, get FILENAME.patch let alone send the
contents of it to an email message using Ediff?

Thank you, for your patience with my effort to verbalize my needs.

Re: ediff

[Peter Dyballa]

Am 11.04.2009 um 19:43 schrieb Sean Sieger:

> And I can do
>
> diff -u a/FILENAME b/FILENAME > FILENAME.patch
>
> and get that file. Is that what you mean?

I think Sebastien tried to tell you to use the command D from Ediff.  
Did you see (and read) the Ediff help window?

--
Greetings

   Pete
               <\
                 \__     O                       __O
                 | O\   _\\/\-%                _`\<,
                 '()-'-(_)--(_)               (_)/(_)

Re: ediff

[Sean Sieger]

Peter Dyballa <Peter_Dyballa@Web.DE> writes:

    I think Sebastien tried to tell you to use the command D from
    Ediff. Did you see (and read) the Ediff help window?

Yes, um several times, but I didn't make sense of or explore the D
command. [Tail between legs.]  Got it.  Thank you both.

Is this patch of the form I ought to be submitting to the developers?

*** /home/sean/Desktop/a/buffers.texi	2009-04-10 08:41:20.000000000 -0400
--- /home/sean/Desktop/b/buffers.texi	2009-04-11 14:08:06.000000000 -0400
***************
*** 583,590 ****
  
  @vindex uniquify-buffer-name-style
    Other methods work by adding parts of each file's directory to the
! buffer name.  To select one, customize the variable
! @code{uniquify-buffer-name-style} (@pxref{Easy Customization}).
  
    To begin with, the @code{forward} naming method includes part of the
  file's directory name at the beginning of the buffer name; using this
--- 583,592 ----
  
  @vindex uniquify-buffer-name-style
    Other methods work by adding parts of each file's directory to the
! buffer name.  Enable the methods by adding @code{(require 'uniquify)} to
! your .emacs or interactively with @kbd{M-x
! toggle-uniquify-buffer-names}.  To select one, customize the
! variable@code{uniquify-buffer-name-style} (@pxref{Easy Customization}).
  
    To begin with, the @code{forward} naming method includes part of the
  file's directory name at the beginning of the buffer name; using this

Re: ediff

[Peter Dyballa]

Am 11.04.2009 um 20:40 schrieb Sean Sieger:

> Is this patch of the form I ought to be submitting to the developers?

It's one possible form. The other is the unified context diff,  
involving the -u option.

You can easily check whether it works: copy the elder a version to / 
tmp and then patch it with the Ediff output file (Ediff can also patch).

--
Greetings

   Pete

Bigamy is having one wife too many. Monogamy is the same.
				– Oscar Wilde

Re: ediff

[Sean Sieger]

Peter Dyballa <Peter_Dyballa@Web.DE> writes:

    It's one possible form. The other is the unified context diff,
    involving the -u option.

Got it.  I found ediff-custom-diff-options and used it.

    You can easily check whether it works: copy the elder a version to /
    tmp and then patch it with the Ediff output file (Ediff can also patch).

Tried this also.  Thank you for the encouragement, Pete.  Um, I'm still
trying to see it through a developer's eyes.  The exercise that you
suggested helped a lot though.

Say I don't want to mess up files in my emacs/ so I do something like
move a copy of buffers.texi to /tmp ... but see ... that's where it
breaks down in my mind, knowing that when I run Ediff, it's going to
rename the elder file buffers.texi.orig ... but I cannot start out with
two files named buffers.texi in /tmp ...

Help, please.

Re: ediff

[Peter Dyballa]

Am 12.04.2009 um 01:20 schrieb Sean Sieger:

> but I cannot start out with two files named buffers.texi in /tmp ...


Modern file systems can offer millions of possible directories. And  
the number of file names can even be bigger.

--
Greetings

   Pete

Theory and practice are the same, in theory, but, in practice, they  
are different.

Re: ediff

[Sean Sieger]

Peter Dyballa <Peter_Dyballa@Web.DE> writes:

    Am 12.04.2009 um 01:20 schrieb Sean Sieger:

    > but I cannot start out with two files named buffers.texi in /tmp ...


    Modern file systems can offer millions of possible directories. And
    the number of file names can even be bigger.

I'm laughing at myself here; I enjoy how you say things, Pete.  I think
I must be getting confused with the results the diffs of files under
version control and the kind that I get.

Again, thank you, thank you---I've got my foot in the door and I am
already using Ediff for my purposes; and you've helped me learn to read
the documentation.