Hey everybody, I just added support to fassembler for performing side- 
by-side merges using sdiff.  Now, when there is a file content  
conflict, instead of just keeping the original or copying over, you  
can choose 'm' from the prompt, and you will be given a list of  
changes one at a time, and the ability to choose from one, the other,  
or edit the file directly.  An example using a modified  
deliverance.ini from one of my projects:

== Install Paste configuration ==
Replace 2527 bytes with 2529 bytes (1/73 lines changed)
File etc/deliverance/deliverance.ini already exists (with different  
substitutions, but same original template)
Overwrite /home/douglas/topp/polishing/etc/deliverance/deliverance.ini  
[y/n/d/b/m/?] ?
Responses:
Y(es): Overwrite the file with the new content.
N(o): Do not overwrite the file.
D(iff): Show a unified diff of the proposed changes (dc=context diff)
B(ackup): Save the current file contents to a .bak file
(and overwrite)
M(erge): Perform a side-by-side merge of the affected files
Type "all Y/N/B/M" to use Y/N/B/M for answer to all future questions

Overwrite /home/douglas/topp/polishing/etc/deliverance/deliverance.ini  
[y/n/d/b/m/?] m
host = 0.0.0.0 | host = localhost
%?
ed: Edit then use both versions, each decorated with a header.
eb: Edit then use both versions.
el: Edit then use the left version.
er: Edit then use the right version.
e: Edit a new version.
l: Use the left version.
r: Use the right version.
s: Silently include common lines.
v: Verbosely include common lines.
q: Quit.
%l
Aborting copy
Configuration written to etc/deliverance/deliverance.ini
== Install Paste startup script ==
Startup script written to bin/start-deliverance
== Install supervisor startup script ==
Supervisor config written to etc/supervisor.d/deliverance.ini
== Save URI setting ==
Done with project fassembler:deliverance
Installation successful.

Attachments

text.html (text/html) 4.0 kB