Comments for [ andy.mcintosh ] http://www.andymcintosh.com Sat, 19 Apr 2014 08:24:09 +0000 hourly 1 Comment on Using p4merge as a git mergetool by Gregory http://www.andymcintosh.com/?p=33&cpage=1#comment-178395 Gregory Sat, 19 Apr 2014 08:24:09 +0000 http://www.andymcintosh.com/?p=33#comment-178395 I updated the scripts I provided here on the following post: http://pempek.net/articles/2014/04/18/git-p4merge/ I updated the scripts I provided here on the following post: http://pempek.net/articles/2014/04/18/git-p4merge/

]]>
Comment on Work-around for XMLDecoder Bug #SDK-17271 by Tim John http://www.andymcintosh.com/?p=130&cpage=1#comment-20163 Tim John Wed, 25 Jan 2012 19:41:16 +0000 http://www.andymcintosh.com/?p=130#comment-20163 Thank you! It took me all day to realise that empty tags weren't being parsed. Thought it was my mistake. You've solved my problem in a jiffy! And nice one Max for the extra check. Thank you! It took me all day to realise that empty tags weren’t being parsed. Thought it was my mistake. You’ve solved my problem in a jiffy! And nice one Max for the extra check.

]]>
Comment on Using p4merge as a git mergetool by Sam Deane http://www.andymcintosh.com/?p=33&cpage=1#comment-12855 Sam Deane Fri, 28 Oct 2011 10:02:15 +0000 http://www.andymcintosh.com/?p=33#comment-12855 This was very helpful, cheers. One trick that I do in my version of your diff script is to copy the files into /tmp and append the revision hash to their filenames, then call p4merge to diff the copies. It makes it slightly easier to work out which revision is which if you're diffing between two arbitrary points in the history. This was very helpful, cheers.

One trick that I do in my version of your diff script is to copy the files into /tmp and append the revision hash to their filenames, then call p4merge to diff the copies. It makes it slightly easier to work out which revision is which if you’re diffing between two arbitrary points in the history.

]]>
Comment on Using p4merge as a git mergetool by Dave Bayer http://www.andymcintosh.com/?p=33&cpage=1#comment-9543 Dave Bayer Wed, 31 Aug 2011 14:14:08 +0000 http://www.andymcintosh.com/?p=33#comment-9543 As of August 2011, Gregory's p4merge script works perfectly for me. The only entries in my .gitconfig file that have anything to do with diff or merge are <code> [merge] tool = p4merge [mergetool] prompt = false </code> and so far, p4merge works vastly better for me than opendiff. The command 'git diff' uses the terminal window, but 'git difftool' uses P4Merge. A nice choice to have, both have their uses. In particular, Unicode characters display without the hack required for opendiff. The files open one at a time without the prompt, and close with command-W, leaving P4Merge running. No temporary files are left behind. I repeat, if you are tempted to use any diff or merge related lines in .gitconfig not shown here, prove to yourself that you need them, then please post a comment for all of us explaining why they were necessary. Don't play Simon Says with anything else found on the web, as Gregory notes it is probably out of date. (Like most code-related apps, P4Merge looks much better using the Lucida Console font, at a larger font size.) As of August 2011, Gregory’s p4merge script works perfectly for me. The only entries in my .gitconfig file that have anything to do with diff or merge are


[merge]
tool = p4merge
[mergetool]
prompt = false

and so far, p4merge works vastly better for me than opendiff. The command ‘git diff’ uses the terminal window, but ‘git difftool’ uses P4Merge. A nice choice to have, both have their uses.

In particular, Unicode characters display without the hack required for opendiff. The files open one at a time without the prompt, and close with command-W, leaving P4Merge running. No temporary files are left behind.

I repeat, if you are tempted to use any diff or merge related lines in .gitconfig not shown here, prove to yourself that you need them, then please post a comment for all of us explaining why they were necessary.

Don’t play Simon Says with anything else found on the web, as Gregory notes it is probably out of date.

(Like most code-related apps, P4Merge looks much better using the Lucida Console font, at a larger font size.)

]]>
Comment on Flex 4 IconButton by Mark http://www.andymcintosh.com/?p=179&cpage=1#comment-3643 Mark Wed, 08 Jun 2011 19:11:00 +0000 http://www.andymcintosh.com/?p=179#comment-3643 I did have same problem as CHRIS-. I changed s:SimpleText by s:Label and no text is shown. I did have same problem as CHRIS-. I changed s:SimpleText by s:Label and no text is shown.

]]>
Comment on A Better Prompting TextInput with Flex 4 by mark gretzinger http://www.andymcintosh.com/?p=207&cpage=1#comment-2990 mark gretzinger Tue, 31 May 2011 20:45:50 +0000 http://www.andymcintosh.com/?p=207#comment-2990 Even with the changes listed in the comment I was not able to get this to work properly. It won't focus. Even with the changes listed in the comment I was not able to get this to work properly.
It won’t focus.

]]>
Comment on Center Adobe AIR Window by Dale Fraser http://www.andymcintosh.com/?p=79&cpage=1#comment-2654 Dale Fraser Thu, 26 May 2011 11:29:43 +0000 http://www.andymcintosh.com/?p=79#comment-2654 I have a creationComplete init method tried passing this as the paramater but it doesnt work, what do I pass? I have a creationComplete init method

tried passing this as the paramater but it doesnt work, what do I pass?

]]>
Comment on Using p4merge as a git mergetool by Gal http://www.andymcintosh.com/?p=33&cpage=1#comment-2496 Gal Tue, 24 May 2011 00:27:34 +0000 http://www.andymcintosh.com/?p=33#comment-2496 Thanks for this - I keep referring back to this post. As of 5/23/11 newest version of p4merge for OSX is 10.2, available here: http://ftp.perforce.com/perforce/r10.2/bin.macosx105u/ Thanks for this – I keep referring back to this post.

As of 5/23/11 newest version of p4merge for OSX is 10.2, available here:
http://ftp.perforce.com/perforce/r10.2/bin.macosx105u/

]]>
Comment on Using p4merge as a git mergetool by Aseem Kishore http://www.andymcintosh.com/?p=33&cpage=1#comment-991 Aseem Kishore Mon, 18 Apr 2011 04:41:33 +0000 http://www.andymcintosh.com/?p=33#comment-991 Great article! And even better comments. Just a quick typo fix: <code>keepBackup = false;</code> Should probably instead be: <code>keepBackup = false</code> The semi-colon seems to be invalid. Great article! And even better comments. Just a quick typo fix:

keepBackup = false;

Should probably instead be:

keepBackup = false

The semi-colon seems to be invalid.

]]>
Comment on Flex 4 IconButton by Anurag Chouksey http://www.andymcintosh.com/?p=179&cpage=1#comment-663 Anurag Chouksey Wed, 16 Mar 2011 06:13:44 +0000 http://www.andymcintosh.com/?p=179#comment-663 Really nice example and the right way of doing . Thanks. Really nice example and the right way of doing . Thanks.

]]>