From users-return-4108-daniel=haxx.se@subversion.apache.org Wed Aug 4 21:13:35 2010 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on giant.haxx.se X-Spam-Level: X-Spam-Status: No, score=0.5 required=3.0 tests=BAYES_00,FREEMAIL_FROM, HTML_MESSAGE,T_RP_MATCHES_RCVD autolearn=no version=3.3.1 Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by giant.haxx.se (8.14.3/8.14.3/Debian-9.1) with SMTP id o74JDYdS018209 for ; Wed, 4 Aug 2010 21:13:35 +0200 Received: (qmail 15166 invoked by uid 500); 4 Aug 2010 19:13:25 -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 15159 invoked by uid 99); 4 Aug 2010 19:13:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Aug 2010 19:13:25 +0000 X-ASF-Spam-Status: No, hits=2.2 required=10.0 tests=FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_PASS Received-SPF: pass (nike.apache.org: domain of mark_aok@hotmail.com designates 65.55.34.90 as permitted sender) Received: from [65.55.34.90] (HELO col0-omc2-s16.col0.hotmail.com) (65.55.34.90) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Aug 2010 19:13:15 +0000 Received: from COL116-W52 ([65.55.34.73]) by col0-omc2-s16.col0.hotmail.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 4 Aug 2010 12:09:12 -0700 Message-ID: Content-Type: multipart/alternative; boundary="_2e311596-53dc-4fcd-b782-9af9fbad40c1_" X-Originating-IP: [209.226.137.106] From: Mark _ To: Subject: svn diff working copy against a different branch Date: Wed, 4 Aug 2010 19:09:12 +0000 Importance: Normal MIME-Version: 1.0 X-OriginalArrivalTime: 04 Aug 2010 19:09:12.0839 (UTC) FILETIME=[86568170:01CB3408] X-Virus-Checked: Checked by ClamAV on apache.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.3.5 (giant.haxx.se [80.67.6.50]); Wed, 04 Aug 2010 21:13:35 +0200 (CEST) X-Friend: Nope --_2e311596-53dc-4fcd-b782-9af9fbad40c1_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hi all=2C I have a system where there is a "trunk" and a branch called "branchX". I = have checked out branchX and merged the trunk code into branchX on my worki= ng copy. I am trying to diff my working copy against trunk like so: svn diff --old=3Dhttp://path-to-dir/myDirectory --new=3DmyDirectory the diff compares branchX WITHOUT the modifications in my working copy and = shows many differences. The working copy is definitely identical to trunk becaue when I use the uni= x style diff (see below) there are absolutely no differences. diff -rux ".svn" myDirectory /home/mark/myDirectory Is it possible to diff a working copy against code in another branch (trunk= in this case)? Or is it expected to checkout trunk and use a diff utility= every time? I'm using svn 1.6.5. Thanks=2C Mark=20 = --_2e311596-53dc-4fcd-b782-9af9fbad40c1_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Hi all=2C

I have a system where there is a "trunk" and a branch call= ed "branchX". =3B I have checked out branchX and merged the trunk code = into branchX on my working copy. =3B I am trying to diff my working cop= y against trunk like so:
 =3B =3B =3B =3B svn diff --old= =3Dhttp://path-to-dir/myDirectory --new=3DmyDirectory

the diff compa= res branchX WITHOUT the modifications in my working copy and shows many dif= ferences.

The working copy is definitely identical to trunk becaue w= hen I use the unix style diff (see below) there are absolutely no differenc= es.

 =3B =3B =3B =3B diff -rux ".svn" myDirectory /h= ome/mark/myDirectory

Is it possible to diff a working copy against c= ode in another branch (trunk in this case)? =3B Or is it expected to ch= eckout trunk and use a diff utility every time?

I'm using svn 1.6.5.=

Thanks=2C
Mark



= --_2e311596-53dc-4fcd-b782-9af9fbad40c1_--