From users-return-27088-archive-asf-public=cust-asf.ponee.io@subversion.apache.org Sat Apr 28 09:39:51 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 07EB5180649 for ; Sat, 28 Apr 2018 09:39:50 +0200 (CEST) Received: (qmail 97772 invoked by uid 500); 28 Apr 2018 07:39:49 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 97758 invoked by uid 99); 28 Apr 2018 07:39:48 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Apr 2018 07:39:48 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id 1D65E180097 for ; Sat, 28 Apr 2018 07:39:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 5.45 X-Spam-Level: ***** X-Spam-Status: No, score=5.45 tagged_above=-999 required=6.31 tests=[DKIM_ADSP_CUSTOM_MED=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, KAM_LAZY_DOMAIN_SECURITY=1, NML_ADSP_CUSTOM_MED=1.2, RDNS_NONE=3] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 7h9HM4loB_wZ for ; Sat, 28 Apr 2018 07:39:46 +0000 (UTC) Received: from blaine.gmane.org (unknown [195.159.176.226]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id CB1DC5F4AE for ; Sat, 28 Apr 2018 07:39:45 +0000 (UTC) Received: from list by blaine.gmane.org with local (Exim 4.84_2) (envelope-from ) id 1fCKQE-0008Ei-S7 for users@subversion.apache.org; Sat, 28 Apr 2018 09:37:30 +0200 X-Injected-Via-Gmane: http://gmane.org/ To: users@subversion.apache.org From: Bo Berglund Subject: Re: command line syntax for svn diff Date: Sat, 28 Apr 2018 09:39:35 +0200 Lines: 67 Message-ID: References: Reply-To: bo.berglund@gmail.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Complaints-To: usenet@blaine.gmane.org X-Newsreader: Forte Free Agent 1.92/32.572 On Sat, 28 Apr 2018 06:39:24 +0000, Arwin Arni Nandagopal wrote: >There are revision keywords like HEAD which references the latest revision >and PREV which references the last changed revision of the target. >E.g: SVN diff -rHEAD:PREV target.file will show the changes between the last >changed revision for that file and the latest revision, which is effectively >the change introduced by that last revision. > Thanks! That made a good way forward! I did this on the command line: svn diff -r HEAD:PREV espconfig.cpp And now I get output which is a regular (humanly unreadable) diff: Index: espconfig.cpp =================================================================== --- espconfig.cpp (revision 2446) +++ espconfig.cpp (revision 2434) @@ -175,7 +175,6 @@ * A sets IP address as X.Y.Z.W format * B sets the serial port baud rate * C sets the wifi channel number in AP mode (0-13 where 0 means no setting) - * F sets the STA mode IP address fixed state * H sets if AP mode ssid shall be hidden (1) or not (0) * L load config into CnfTmp * M sets the WiFi mode @@ -187,7 +186,6 @@ * a gets IP address * b gets the serial port baud rate * c gets the AP mode channel number (0..13) - * f gets the STA mode fixed address setting (0..1) * h gets the AP mode ssid hidden state (0/1) * i gets the WiFi MAC address * m gets the WiFi mode .... etc with + and - indicators.... But what I would like is to get this loaded into WinMerge so I can examine side by side the code changes in context. And of course the example from the WinMerge docs does not work yet... I modified it thus: svn diff -r HEAD:PREV --diff-cmd "C:\Programs\WinMerge\WinMergeU.exe" -x "-dl -dr" espconfig.cpp I have no idea what the parameters "-dl -dr" axtually do, though. Question: --------- Since I am new to SVN but it has been around for like 15 years I expected this diff use to be pretty common but I find little info when I google. Do people not use diffs into sensible GUI display programs like WinMerge when using SVN? Or is GUI equivalent to saying TortoiseSVN? (which I cannot install for reasons explained in my start post). -- Bo Berglund Developer in Sweden