Solved

Patching problem

Posted on 2004-09-13
4
354 Views
Last Modified: 2010-04-20
Usually patch is done by:
  diff -Naur file1 file2 > patch.1
And to patch file2:
  patch < patch.1

Now let's assume that I want to patch file2 with the differences from file1. However all the initial differences of file2 I want to keep.
In other words I want to apply only '+' changes in patch.1 but not to apply '-'.

Is it possible ? And if yes, how can I do this...
0
Comment
Question by:dimitry
  • 2
4 Comments
 

Expert Comment

by:aadilfahad
ID: 12049331
It Is Possible And You Can Simply Read Out Each Information About This By That Weblink

www.linuxjalali.com/forum   in linux section
0
 
LVL 11

Author Comment

by:dimitry
ID: 12049390
Can you please be more specific. I didn't find any patching issue on this forum.
0
 
LVL 23

Accepted Solution

by:
Mysidia earned 250 total points
ID: 12049748
What are you trying to do exactly?

Your commands would take the differences between file1 and file2, then
apply them to file1.

If you're trying to do a 3-way merge changes from one set of files into a third
then the command you should be using is merge...

see http://www.die.net/doc/linux/man/man1/merge.1.html
0
 
LVL 11

Author Comment

by:dimitry
ID: 12049855
Thanks Mysidia,
I wanted something else, but with merge I can achieve same result.
0

Featured Post

Master Your Team's Linux and Cloud Stack!

The average business loses $13.5M per year to ineffective training (per 1,000 employees). Keep ahead of the competition and combine in-person quality with online cost and flexibility by training with Linux Academy.

Question has a verified solution.

If you are experiencing a similar issue, please ask a related question

Setting up Secure Ubuntu server on VMware 1.      Insert the Ubuntu Server distribution CD or attach the ISO of the CD which is in the “Datastore”. Note that it is important to install the x64 edition on servers, not the X86 editions. 2.      Power on th…
Join Greg Farro and Ethan Banks from Packet Pushers (http://packetpushers.net/podcast/podcasts/pq-show-93-smart-network-monitoring-paessler-sponsored/) and Greg Ross from Paessler (https://www.paessler.com/prtg) for a discussion about smart network …
Learn how to get help with Linux/Unix bash shell commands. Use help to read help documents for built in bash shell commands.: Use man to interface with the online reference manuals for shell commands.: Use man to search man pages for unknown command…
This demo shows you how to set up the containerized NetScaler CPX with NetScaler Management and Analytics System in a non-routable Mesos/Marathon environment for use with Micro-Services applications.

860 members asked questions and received personalized solutions in the past 7 days.

Join the community of 500,000 technology professionals and ask your questions.

Join & Ask a Question