sdiff related.....

sdiff related.....

[dheeraj seth]

Hi everybody,
I have searched amlost evrything mentioned on the cygwin site.
The Problem is:
i used  diff utility to get differences between two files(F1 and F2).It 
worked.it gave me the changes to add and replace in the file(F2), now i can 
use sdiff but the problem is want to add a line before and after the 
changes, when sidff adds those changes to the file.
Is there any option to add my lines while doing this?
Please any help would be really appreciated.

Thanks a lot.
Best Regards.

Example: this is a portion of output by diff

diff -r 72/compproc/xbpaEstimateLineSelect.sql 
73/compproc/xbpaEstimateLineSelect.sql
56a57,63
>	AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 1 from PCB00125 
>		where PCBJOBNUMBER = @project
>		      AND PCBPNUM = @phase))


Want to Add this to File F2:

#If xyz == 21
AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 1 from PCB00125
where PCBJOBNUMBER = @project
AND PCBPNUM = @phase))
#endif






_________________________________________________________________
Surf the Web without missing calls! Get MSN Broadband.  
http://resourcecenter.msn.com/access/plans/freeactivation.asp


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: sdiff related.....

[Igor Pechtchanski]

This is really off-topic for this list, as it has nothing whatsoever to do
with cygwin.

That said, try the -D option of diff (man diff, search for "-D").
	Igor

On Thu, 24 Oct 2002, dheeraj seth wrote:

> Hi everybody,
> I have searched amlost evrything mentioned on the cygwin site.
> The Problem is:
> i used  diff utility to get differences between two files(F1 and F2).It
> worked.it gave me the changes to add and replace in the file(F2), now i can
> use sdiff but the problem is want to add a line before and after the
> changes, when sidff adds those changes to the file.
> Is there any option to add my lines while doing this?
> Please any help would be really appreciated.
>
> Thanks a lot.
> Best Regards.
>
> Example: this is a portion of output by diff
>
> diff -r 72/compproc/xbpaEstimateLineSelect.sql
> 73/compproc/xbpaEstimateLineSelect.sql
> 56a57,63
> >       AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 1 from PCB00125
> >               where PCBJOBNUMBER = @project
> >                     AND PCBPNUM = @phase))
>
>
> Want to Add this to File F2:
>
> #If xyz == 21
> AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 1 from PCB00125
> where PCBJOBNUMBER = @project
> AND PCBPNUM = @phase))
> #endif

-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_		pechtcha@cs.nyu.edu
ZZZzz /,`.-'`'    -.  ;-;;,_		igor@watson.ibm.com
     |,4-  ) )-,_. ,\ (  `'-'		Igor Pechtchanski
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"Water molecules expand as they grow warmer" (C) Popular Science, Oct'02, p.51


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: sdiff related.....

[Harig, Mark A.]

Consider downloading and installing the 'patch' utility
in the 'Utils' category.  'patch --help', 'info patch',
or 'man patch' at your shell prompt will give you
instructions on how to use it.

> -----Original Message-----
> From: dheeraj seth [mailto:seth_dheeraj@hotmail.com]
> Sent: Thursday, October 24, 2002 6:47 PM
> To: cygwin@cygwin.com
> Subject: sdiff related.....
> 
> 
> Hi everybody,
> I have searched amlost evrything mentioned on the cygwin site.
> The Problem is:
> i used  diff utility to get differences between two files(F1 
> and F2).It 
> worked.it gave me the changes to add and replace in the 
> file(F2), now i can 
> use sdiff but the problem is want to add a line before and after the 
> changes, when sidff adds those changes to the file.
> Is there any option to add my lines while doing this?
> Please any help would be really appreciated.
> 
> Thanks a lot.
> Best Regards.
> 
> Example: this is a portion of output by diff
> 
> diff -r 72/compproc/xbpaEstimateLineSelect.sql 
> 73/compproc/xbpaEstimateLineSelect.sql
> 56a57,63
> >	AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 
> 1 from PCB00125 
> >		where PCBJOBNUMBER = @project
> >		      AND PCBPNUM = @phase))
> 
> 
> Want to Add this to File F2:
> 
> #If xyz == 21
> AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 1 
> from PCB00125
> where PCBJOBNUMBER = @project
> AND PCBPNUM = @phase))
> #endif
> 
> 
> 
> 
> 
> 
> _________________________________________________________________
> Surf the Web without missing calls! Get MSN Broadband.  
> http://resourcecenter.msn.com/access/plans/freeactivation.asp
> 
> 
> --
> Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
> Bug reporting:         http://cygwin.com/bugs.html
> Documentation:         http://cygwin.com/docs.html
> FAQ:                   http://cygwin.com/faq/
> 
> 

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

RE: sdiff related.....

[dheeraj seth]

Hi Thanks,
-D is really a option in diff,and it works....but it says
"-D option not supported with directories"
any way to overcome this?

Thanks again
Best Regards



>From: "Harig, Mark A." <maharig@idirect.net>
>To: "dheeraj seth" <seth_dheeraj@hotmail.com>,<cygwin@cygwin.com>
>Subject: RE: sdiff related.....
>Date: Thu, 24 Oct 2002 18:51:55 -0400
>
>Consider downloading and installing the 'patch' utility
>in the 'Utils' category.  'patch --help', 'info patch',
>or 'man patch' at your shell prompt will give you
>instructions on how to use it.
>
> > -----Original Message-----
> > From: dheeraj seth [mailto:seth_dheeraj@hotmail.com]
> > Sent: Thursday, October 24, 2002 6:47 PM
> > To: cygwin@cygwin.com
> > Subject: sdiff related.....
> >
> >
> > Hi everybody,
> > I have searched amlost evrything mentioned on the cygwin site.
> > The Problem is:
> > i used  diff utility to get differences between two files(F1
> > and F2).It
> > worked.it gave me the changes to add and replace in the
> > file(F2), now i can
> > use sdiff but the problem is want to add a line before and after the
> > changes, when sidff adds those changes to the file.
> > Is there any option to add my lines while doing this?
> > Please any help would be really appreciated.
> >
> > Thanks a lot.
> > Best Regards.
> >
> > Example: this is a portion of output by diff
> >
> > diff -r 72/compproc/xbpaEstimateLineSelect.sql
> > 73/compproc/xbpaEstimateLineSelect.sql
> > 56a57,63
> > >	AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select
> > 1 from PCB00125
> > >		where PCBJOBNUMBER = @project
> > >		      AND PCBPNUM = @phase))
> >
> >
> > Want to Add this to File F2:
> >
> > #If xyz == 21
> > AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 1
> > from PCB00125
> > where PCBJOBNUMBER = @project
> > AND PCBPNUM = @phase))
> > #endif
> >
> >
> >
> >
> >
> >
> > _________________________________________________________________
> > Surf the Web without missing calls! Get MSN Broadband.
> > http://resourcecenter.msn.com/access/plans/freeactivation.asp
> >
> >
> > --
> > Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
> > Bug reporting:         http://cygwin.com/bugs.html
> > Documentation:         http://cygwin.com/docs.html
> > FAQ:                   http://cygwin.com/faq/
> >
> >


_________________________________________________________________
Unlimited Internet access for only $21.95/month.  Try MSN! 
http://resourcecenter.msn.com/access/plans/2monthsfree.asp


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/

Re: sdiff related.....

[Igor Pechtchanski]

Dheeraj,

This is really, REALLY off-topic for this list.  This has nothing to do
with Cygwin.  You may have better luck with some Unix newbie newsgroup
(e.g., comp.unix.questions).

In hopes that this won't encourage further off-topic posts, try also "man
find", especially the "-exec" option, or "man xargs".  If you have further
questions about using these utilities, please address them to an
appropriate newsgroup or mailing list.

If you have a question that pertains specifically to cygwin, you are, of
course, welcome to post it here.
	Igor

On Fri, 25 Oct 2002, dheeraj seth wrote:

> Hi Thanks,
> -D is really a good option but it says
> "-D option not supported with directories"
> any way to overcome this?
>
> Thanks again
> Best Regards
>
> >From: Igor Pechtchanski <pechtcha@cs.nyu.edu>
> >Reply-To: cygwin@cygwin.com
> >To: dheeraj seth <seth_dheeraj@hotmail.com>
> >CC: cygwin@cygwin.com
> >Subject: Re: sdiff related.....
> >Date: Thu, 24 Oct 2002 20:40:17 -0400 (EDT)
> >
> >This is really off-topic for this list, as it has nothing whatsoever to do
> >with cygwin.
> >
> >That said, try the -D option of diff (man diff, search for "-D").
> >	Igor
> >
> >On Thu, 24 Oct 2002, dheeraj seth wrote:
> >
> > > Hi everybody,
> > > I have searched amlost evrything mentioned on the cygwin site.
> > > The Problem is:
> > > i used  diff utility to get differences between two files(F1 and F2).It
> > > worked.it gave me the changes to add and replace in the file(F2), now i
> > > can use sdiff but the problem is want to add a line before and after the
> > > changes, when sidff adds those changes to the file.
> > > Is there any option to add my lines while doing this?
> > > Please any help would be really appreciated.
> > >
> > > Thanks a lot.
> > > Best Regards.
> > >
> > > Example: this is a portion of output by diff
> > >
> > > diff -r 72/compproc/xbpaEstimateLineSelect.sql
> > > 73/compproc/xbpaEstimateLineSelect.sql
> > > 56a57,63
> > > >       AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 1 from PCB00125
> > > >               where PCBJOBNUMBER = @project
> > > >                     AND PCBPNUM = @phase))
> > >
> > > Want to Add this to File F2:
> > >
> > > #If xyz == 21
> > > AND (PCBACTUALQTY < PCBESTIMATEQTY or not exists(select 1 from PCB00125
> > > where PCBJOBNUMBER = @project
> > > AND PCBPNUM = @phase))
> > > #endif

-- 
				http://cs.nyu.edu/~pechtcha/
      |\      _,,,---,,_		pechtcha@cs.nyu.edu
ZZZzz /,`.-'`'    -.  ;-;;,_		igor@watson.ibm.com
     |,4-  ) )-,_. ,\ (  `'-'		Igor Pechtchanski
    '---''(_/--'  `-'\_) fL	a.k.a JaguaR-R-R-r-r-r-.-.-.  Meow!

"Water molecules expand as they grow warmer" (C) Popular Science, Oct'02, p.51


--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/