Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

8 messages Options
Embed this post
Permalink
Gale (Audacity Team)

Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

Reply Threaded More More options
Print post
Permalink

| From Ed Musgrove <[hidden email]>
| Tue, 6 Oct 2009 08:35:05 -0700 (PDT)
| Subject: [Audacity-devel] Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect
> The only CVS client which I could find to work on 64-bit Vista was
> CVSNT 2.0.51d; WinCVS  2.0.9.1 (Build 1) seems to work as a front
> end but I have not been able to figure out how to use it. I have never
> use any automated source control before -- please pardon my ignorance!

See:
http://wiki.audacityteam.org/index.php?title=SubmittingPatches#How_to_create_a_patch

I have used DiffUtils for Windows mentioned there with
success, but had you been able to install Tortoise, its
"Make Patch" context menu choice from Explorer is really
easy.

On Vista 32-bit, I installed Tortoise fine, but I had to choose
the installer option to close Explorer windows manually, and
close all such windows before proceeding. I disable User
Account Control anyway, so am not affected by those sort of
problems which some Tortoise users report.  

Tortoise supports 64-bit XP, so the issue may be Vista rather
than 64-bit.




Gale




> ----- Original Message ----
> > From: Markus Meyer [hidden email]
> >
> > Hi Ed,
> >
> > which CVS client do you use?




------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
audacity-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Ed Musgrove

Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

Reply Threaded More More options
Print post
Permalink
----- Original Message ----
> From: Gale Andrews <[hidden email]>
>
> See:
> http://wiki.audacityteam.org/index.php?title=SubmittingPatches#How_to_create_a_patch

I started there in the first place. DiffUtils and xfdiff are both GnuWin--that is
what I used to create the patch you did not like. I used it just as specified on the above
mentioned Wiki.

>had you been able to install Tortoise... On Vista 32-bit, I installed Tortoise
>fine...Tortoise supports 64-bit XP, so the issue may be Vista rather than 64-bit.

The Tortoise installer refuses to run on Vista 64 (in any mode and/or run as admin.)

Did you look at the newer patch?
 
-Ed Musgrove


     

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
audacity-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Gale (Audacity Team)

Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

Reply Threaded More More options
Print post
Permalink

| From Ed Musgrove <[hidden email]>
| Tue, 6 Oct 2009 15:08:44 -0700 (PDT)
| Subject: [Audacity-devel] How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect
> ----- Original Message ----
> > From: Gale Andrews <[hidden email]>
> >
> > See:
> > http://wiki.audacityteam.org/index.php?title=SubmittingPatches#How_to_create_a_patch
>
> I started there in the first place. DiffUtils and xfdiff are both GnuWin--that is
> what I used to create the patch you did not like. I used it just as specified on the above
> mentioned Wiki.

It was not that I didn't like it, it wasn't usable (in any automatic
way) or clear what was changing (if trying to apply it manually).  


> >had you been able to install Tortoise... On Vista 32-bit, I installed Tortoise
> >fine...Tortoise supports 64-bit XP, so the issue may be Vista rather than 64-bit.
>
> The Tortoise installer refuses to run on Vista 64 (in any mode and/or run as admin.)

I've seen a solution on the web that was said to work:
"Install the 32-bit version [of TortoiseCVS] and run [it]
from the 32-bit version of Windows Explorer (a pain)".

For the GnuWin diffutils, have you tried:
http://www.gnu.org/software/diffutils/manual/html_mono/diff.html#Tips%20for%20Patch%20Producers

 
> Did you look at the newer patch?

Yes, how did you produce that one? I successfully patched
Project.cpp with that patch using the GnuWin "patch.exe",
diffed it against the original Project.cpp and the diff seemed
to match your patch. So if no-one else comments or commits
it, I could commit it.

As Markus said though, when you have a patch that applies
changes to large numbers of files we really want one patch,
not one patch per file.
 


Thanks


Gale


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
audacity-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Ed Musgrove

Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

Reply Threaded More More options
Print post
Permalink
----- Original Message ----

> From: Gale Andrews <[hidden email]>
> | From Ed Musgrove
> > I started there in the first place. DiffUtils and xfdiff are both GnuWin--that
> is
> > what I used to create the patch you did not like. I used it just as specified
> on the above
> > mentioned Wiki.
>
> It was not that I didn't like it, it wasn't usable (in any automatic
> way) or clear what was changing (if trying to apply it manually). 

I am sorry about the poor choice of words, "didn't like" was as close as I
could come as your original rejection was not sufficiently detailed for me
to come up with a more exact term <grin>.

> For the GnuWin diffutils, have you tried:
> http://www.gnu.org/software/diffutils/manual/html_mono/diff.html#Tips%20for%20Patch%20Producers
>
>
> > Did you look at the newer patch?
>
> Yes, how did you produce that one? I successfully patched
> Project.cpp with that patch using the GnuWin "patch.exe",
> diffed it against the original Project.cpp and the diff seemed
> to match your patch. So if no-one else comments or commits
> it, I could commit it.

Please commit this patch when and if appropriate; thank you!

The original patch you rejected was created with GNUWin diff using this process:
*copy OLDProject.cpp and NEWProject.cpp into the folder containing GNUWin
*open the CLI and make the current directory the folder containing GNUWin
*command: diff -u OLDProject.cpp NEWProject.cpp > outputFile.txt
outputFile.cpp is the file I attached which he did not like. I was trying the
GnuWin32 version of diff because Markus was less than happy with the Python
output. The Python output was created using the exact same steps (only using
the Python folder) and that is the one that you liked. Unfortunately, the current
version of Python 3.1 which I am using does not do recursion (-r switch) so it will
not do a diff on the Audacity source.

> As Markus said though, when you have a patch that applies
> changes to large numbers of files we really want one patch,
> not one patch per file.

Searching the Internet, I found out why WinCVS was refusing to acknowledge my
version of Python 3.1 -- it is hardcoded to only work with Python 2.4. I searched
my hard drives and found PFrank was using the python24.dll so I pointed WinCVS
at that library and it liked it.
 
Sometime in the near future I will test both the python 3.1 diff utility and the WinCVS
to see if they will do a unified diff on the entire Audacity source. If successful, I will
impose on you (unless you demure) to examine the output to see if either is acceptable.

 -Ed Musgrove


     

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
audacity-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Gale (Audacity Team)

Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

Reply Threaded More More options
Print post
Permalink

| From Ed Musgrove <[hidden email]>
| Wed, 7 Oct 2009 10:12:50 -0700 (PDT)
| Subject: [Audacity-devel] How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

> ----- Original Message ----
> > From: Gale Andrews <[hidden email]>
> > | From Ed Musgrove
>
> > For the GnuWin diffutils, have you tried:
> > http://www.gnu.org/software/diffutils/manual/html_mono/diff.html#Tips%20for%20Patch%20Producers
> >
> >
> > > Did you look at the newer patch?
> >
> > Yes, how did you produce that one? I successfully patched
> > Project.cpp with that patch using the GnuWin "patch.exe",
> > diffed it against the original Project.cpp and the diff seemed
> > to match your patch. So if no-one else comments or commits
> > it, I could commit it.
>
> Please commit this patch when and if appropriate; thank you!
>
> The original patch you rejected was created with GNUWin diff using this process:
> *copy OLDProject.cpp and NEWProject.cpp into the folder containing GNUWin
> *open the CLI and make the current directory the folder containing GNUWin
> *command: diff -u OLDProject.cpp NEWProject.cpp > outputFile.txt
> outputFile.cpp is the file I attached which he did not like.
>
> I was trying the GnuWin32 version of diff because Markus was less than
> happy with the Python output. The Python output was created using the exact
> same steps (only using the Python folder) and that is the one that you liked.
> Unfortunately, the current version of Python 3.1 which I am using does not
> do recursion (-r switch) so it will not do a diff on the Audacity source.
>
>
> > As Markus said though, when you have a patch that applies
> > changes to large numbers of files we really want one patch,
> > not one patch per file.
>
> Searching the Internet, I found out why WinCVS was refusing to acknowledge my
> version of Python 3.1 -- it is hardcoded to only work with Python 2.4. I searched
> my hard drives and found PFrank was using the python24.dll so I pointed WinCVS
> at that library and it liked it.
>  
> Sometime in the near future I will test both the python 3.1 diff utility and the WinCVS
> to see if they will do a unified diff on the entire Audacity source. If successful, I will
> impose on you (unless you demure) to examine the output to see if either is acceptable.

Ed, to cut a long story short, the diff I rejected was a "diff -a"
(text diff).

So instead of the left margin indicating - or + for sections
removed or added respectively, with the surrounding context
above and below, the left margin was a string or < or >
characters, these characters indicating old or new chunks.

While I could have guessed your intentions and applied the
patch manually, a diff -a won't be useful when the patch is
complex.

If you can do a diff -u on the entire source (with whatever
diff utility), it should give us what we want.



Gale

 

 


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
audacity-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Ed Musgrove

Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

Reply Threaded More More options
Print post
Permalink
Mea culpa! I will get it right. What file extension should be
unified patch have?
-Ed Musgrove



----- Original Message ----
> From: Gale Andrews [hidden email]
> Ed, to cut a long story short, the diff I rejected was a "diff -a"
> (text diff).


     

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
audacity-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Gale (Audacity Team)

Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

Reply Threaded More More options
Print post
Permalink

| From Ed Musgrove <[hidden email]>
| Wed, 7 Oct 2009 18:50:34 -0700 (PDT)
| Subject: [Audacity-devel] How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect
> Mea culpa! I will get it right. What file extension should be
> unified patch have?

I would normally expect them to have a .patch extension,
although creating them using diff -u is what matters.



Gale


> ----- Original Message ----
> > From: Gale Andrews [hidden email]
> > Ed, to cut a long story short, the diff I rejected was a "diff -a"
> > (text diff).
>
>
>      
>
> ------------------------------------------------------------------------------
> Come build with us! The BlackBerry(R) Developer Conference in SF, CA
> is the only developer event you need to attend this year. Jumpstart your
> developing skills, take BlackBerry mobile applications to market and stay
> ahead of the curve. Join us from November 9 - 12, 2009. Register now!
> http://p.sf.net/sfu/devconference
> _______________________________________________
> audacity-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/audacity-devel



------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
audacity-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/audacity-devel
Ed Musgrove

Re: How to create a patch WAS: Problem with hidden second project window on Windows WAS: Re: wxGetClientDisplayRect

Reply Threaded More More options
Print post
Permalink
Roger, wilco.
 
-Ed Musgrove

 
----- Original Message ----
> From: Gale Andrews <[hidden email]>
>
>I would normally expect them to have a .patch extension,
> although creating them using diff -u is what matters.



     

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
audacity-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/audacity-devel