ChangesWiki - Recent changes [en]

ChangesWiki - Recent changes [en] http://wiki.changesapp.com/index.php/Special:RecentChanges Track the most recent changes to the wiki in this feed. en MediaWiki 1.13.3 Wed, 08 Sep 2010 17:35:30 GMT SCM Integration Scripts http://wiki.changesapp.com/index.php?title=SCM_Integration_Scripts&diff=474&oldid=prev <p><span class="autocomment">SCM Integration: </span> </p> <a href="http://wiki.changesapp.com/index.php?title=SCM_Integration_Scripts&diff=474&oldid=471">Show changes</a> Wed, 08 Sep 2010 17:20:53 GMT 213.5.64.20 http://wiki.changesapp.com/index.php/Talk:SCM_Integration_Scripts User-Submitted Questions http://wiki.changesapp.com/index.php?title=User-Submitted_Questions&diff=473&oldid=prev <p>sumafarns</p> <table style="background-color: white; color:black;"> <col class='diff-marker' /> <col class='diff-content' /> <col class='diff-marker' /> <col class='diff-content' /> <tr valign='top'> <td colspan='2' style="background-color: white; color:black;">←Older revision</td> <td colspan='2' style="background-color: white; color:black;">Revision as of 15:32, 5 September 2010</td> </tr> <tr><td colspan="2" class="diff-lineno">Line 1:</td> <td colspan="2" class="diff-lineno">Line 1:</td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">== User-Submitted Questions ==</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div><ins class="diffchange diffchange-inline">vapor confirmation compared</ins></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div> </div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">* How does Changes compare to Araxis Merge or other diffing tools (why switch)?</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">** Araxis Merge is a great tool. Changes differs in price (much more affordable), ease of integration with the other tools in your workflow, and is generally considered to be more "Mac-like" than the port of Araxis Merge.</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">* Xcode comes with FileMerge, which I've always found perfectly adequate - and very Mac-like indeed. Again, why switch?</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">** FileMerge is a good basic diffing utility.  The command-line access to it is not as flexible (no --wait state by default, you have to poke at the binary in the FileMerger.app bundle) and it doesn't do directory diffing nearly as well.  I've also noticed that if you use scrolling in FileMerge it can cause the view to flip out and not display correctly until you restart the process. As with any tool you'll need to judge the value for yourself and determine if the cost is worth the benefit.  I've used many diffing utilities over the years including FileMerge.  I decided Changes.app was better for just doing what it needs to do and getting out of my way which is why I don't mind paying for it. -- Dan</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">** Unlike FileMerge, Changes supports UTF-8. --Tuk</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">* Is there a education licence for students?</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">** Educational licenses are evaluated on a case-by-case basis. Please fill out a support request using your institutional email address (usually @institution.edu) in the contact information.</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">* Will there be a version for OS releases earlier thatn 10.5?</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">** Unfortunately, due to dependencies on Core Animation and other Leopard technology (not just UI stuff, we're using some under-the-hood new tech, too), there are no plans for a 10.4 version of Changes. Sorry about that.</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">* Does Changes support 3-way merge (a.k.a. conflict resolution)?</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">* Does Changes look at and diff similar documents within the same folder? (ie: older/newer versions and/or dupes regardless of exact filename?)???</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr> <tr><td class='diff-marker'>-</td><td style="background: #ffa; color:black; font-size: smaller;"><div><del class="diffchange diffchange-inline">* I need this to get a diff from two remote files and give it to chdiff on my mac via netcat, chdiff can do this? (for example: '''diff file1 file2 | chdiff -''')</del></div></td><td class='diff-marker'>+</td><td style="background: #cfc; color:black; font-size: smaller;"><div></div></td></tr>  </table> Sun, 05 Sep 2010 15:32:08 GMT 216.45.58.187 http://wiki.changesapp.com/index.php/Talk:User-Submitted_Questions