It's not unusual for programmers to get their signals crossed and modify the same program in two different directions. To recover from this confusion, you need to merge the two versions. Emerge makes this easier. See also Section 16.9, for commands to compare in a more manual fashion, and .
To start Emerge, run one of these four commands:
Merge two specified files.
Merge two specified files, with reference to a common ancestor.
Merge two buffers.
Merge two buffers with reference to a common ancestor in a third buffer.
The Emerge commands compare two files or buffers, and display the comparison in three buffers: one for each input text (the A buffer and the B buffer), and one (the merge buffer) where merging takes place. The merge buffer shows the full merged text, not just the differences. Wherever the two input texts differ, you can choose which one of them to include in the merge buffer.
The Emerge commands that take input from existing buffers use only the accessible portions of those buffers, if they are narrowed (Section 31.22).
If a common ancestor version is available, from which the two texts to be merged were both derived, Emerge can use it to guess which alternative is right. Wherever one current version agrees with the ancestor, Emerge presumes that the other current version is a deliberate change which should be kept in the merged version. Use the with-ancestor commands if you want to specify a common ancestor text. These commands read three file or buffer names--variant A, variant B, and the common ancestor.
After the comparison is done and the buffers are prepared, the interactive merging starts. You control the merging by typing special merge commands in the merge buffer. The merge buffer shows you a full merged text, not just differences. For each run of differences between the input texts, you can choose which one of them to keep, or edit them both together.
The merge buffer uses a special major mode, Emerge mode, with commands for making these choices. But you can also edit the buffer with ordinary Emacs commands.
At any given time, the attention of Emerge is focused on one particular difference, called the selected difference. This difference is marked off in the three buffers like this:
vvvvvvvvvvvvvvvvvvvv text that differs ^^^^^^^^^^^^^^^^^^^^ |
Emerge numbers all the differences sequentially and the mode line always shows the number of the selected difference.
Normally, the merge buffer starts out with the A version of the text. But when the A version of a difference agrees with the common ancestor, then the B version is initially preferred for that difference.
Emerge leaves the merged text in the merge buffer when you exit. At that point, you can save it in a file with C-x C-w. If you give a numeric argument to emerge-files or emerge-files-with-ancestor, it reads the name of the output file using the minibuffer. (This is the last file name those commands read.) Then exiting from Emerge saves the merged text in the output file.
Normally, Emerge commands save the output buffer in its file when you exit. If you abort Emerge with C-], the Emerge command does not save the output buffer, but you can save it yourself if you wish.
You can choose between two modes for giving merge commands: Fast mode and Edit mode. In Fast mode, basic merge commands are single characters, but ordinary Emacs commands are disabled. This is convenient if you use only merge commands. In Edit mode, all merge commands start with the prefix key C-c C-c, and the normal Emacs commands are also available. This allows editing the merge buffer, but slows down Emerge operations.
Use e to switch to Edit mode, and C-c C-c f to switch to Fast mode. The mode line indicates Edit and Fast modes with E and F.
Emerge has two additional submodes that affect how particular merge commands work: Auto Advance mode and Skip Prefers mode.
If Auto Advance mode is in effect, the a and b commands advance to the next difference. This lets you go through the merge faster as long as you simply choose one of the alternatives from the input. The mode line indicates Auto Advance mode with A.
If Skip Prefers mode is in effect, the n and p commands skip over differences in states prefer-A and prefer-B (Section 24.18.3). Thus you see only differences for which neither version is presumed "correct." The mode line indicates Skip Prefers mode with S.
Use the command s a (emerge-auto-advance-mode) to set or clear Auto Advance mode. Use s s (emerge-skip-prefers-mode) to set or clear Skip Prefers mode. These commands turn on the mode with a positive argument, turns it off with a negative or zero argument, and toggle the mode with no argument.
In the merge buffer, a difference is marked with lines of v and ^ characters. Each difference has one of these seven states:
The difference is showing the A version. The a command always produces this state; the mode line indicates it with A.
The difference is showing the B version. The b command always produces this state; the mode line indicates it with B.
The difference is showing the A or the B state by default, because you haven't made a choice. All differences start in the default-A state (and thus the merge buffer is a copy of the A buffer), except those for which one alternative is "preferred" (see below).
When you select a difference, its state changes from default-A or default-B to plain A or B. Thus, the selected difference never has state default-A or default-B, and these states are never displayed in the mode line.
The command d a chooses default-A as the default state, and d b chooses default-B. This chosen default applies to all differences which you haven't ever selected and for which no alternative is preferred. If you are moving through the merge sequentially, the differences you haven't selected are those following the selected one. Thus, while moving sequentially, you can effectively make the A version the default for some sections of the merge buffer and the B version the default for others by using d a and d b between sections.
The difference is showing the A or B state because it is preferred. This means that you haven't made an explicit choice, but one alternative seems likely to be right because the other alternative agrees with the common ancestor. Thus, where the A buffer agrees with the common ancestor, the B version is preferred, because chances are it is the one that was actually changed.
These two states are displayed in the mode line as A* and B*.
The difference is showing a combination of the A and B states, as a result of the x c or x C commands.
Once a difference is in this state, the a and b commands don't do anything to it unless you give them a numeric argument.
The mode line displays this state as comb.
Here are the Merge commands for Fast mode; in Edit mode, precede them with C-c C-c:
Select the previous difference.
Select the next difference.
Choose the A version of this difference.
Choose the B version of this difference.
Select difference number n.
Select the difference containing point. You can use this command in the merge buffer or in the A or B buffer.
Quit--finish the merge.
Abort--exit merging and do not save the output.
Go into Fast mode. (In Edit mode, this is actually C-c C-c f.)
Go into Edit mode.
Recenter (like C-l) all three windows.
Specify part of a prefix numeric argument.
Also specify part of a prefix numeric argument.
Choose the A version as the default from here down in the merge buffer.
Choose the B version as the default from here down in the merge buffer.
Copy the A version of this difference into the kill ring.
Copy the B version of this difference into the kill ring.
Insert the A version of this difference at point.
Insert the B version of this difference at point.
Put point and mark around the difference.
Scroll all three windows down (like M-v).
Scroll all three windows up (like C-v).
Scroll all three windows left (like C-x <).
Scroll all three windows right (like C-x >).
Reset horizontal scroll on all three windows.
Shrink the merge window to one line. (Use C-u l to restore it to full size.)
Combine the two versions of this difference (Section 24.18.6).
Show the names of the files/buffers Emerge is operating on, in a Help window. (Use C-u l to restore windows.)
Join this difference with the following one. (C-u x j joins this difference with the previous one.)
Split this difference into two differences. Before you use this command, position point in each of the three buffers at the place where you want to split the difference.
Trim identical lines off the top and bottom of the difference. Such lines occur when the A and B versions are identical but differ from the ancestor version.
The q command (emerge-quit) finishes the merge, storing the results into the output file if you specified one. It restores the A and B buffers to their proper contents, or kills them if they were created by Emerge and you haven't changed them. It also disables the Emerge commands in the merge buffer, since executing them later could damage the contents of the various buffers.
C-] aborts the merge. This means exiting without writing the output file. If you didn't specify an output file, then there is no real difference between aborting and finishing the merge.
If the Emerge command was called from another Lisp program, then its return value is t for successful completion, or nil if you abort.
Sometimes you want to keep both alternatives for a particular difference. To do this, use x c, which edits the merge buffer like this:
#ifdef NEW
version from A buffer
#else /* not NEW */
version from B buffer
#endif /* not NEW */
|
While this example shows C preprocessor conditionals delimiting the two alternative versions, you can specify the strings to use by setting the variable emerge-combine-versions-template to a string of your choice. In the string, %a says where to put version A, and %b says where to put version B. The default setting, which produces the results shown above, looks like this:
"#ifdef NEW\n%a#else /* not NEW */\n%b#endif /* not NEW */\n"
|
During the merge, you mustn't try to edit the A and B buffers yourself. Emerge modifies them temporarily, but ultimately puts them back the way they were.
You can have any number of merges going at once--just don't use any one buffer as input to more than one merge at once, since the temporary changes made in these buffers would get in each other's way.
Starting Emerge can take a long time because it needs to compare the files fully. Emacs can't do anything else until diff finishes. Perhaps in the future someone will change Emerge to do the comparison in the background when the input files are large--then you could keep on doing other things with Emacs until Emerge is ready to accept commands.
After setting up the merge, Emerge runs the hook emerge-startup-hook (Section 32.2.3).