Return-Path: 
 <users-return-19879-apmail-subversion-users-archive=subversion.apache.org@subversion.apache.org>
X-Original-To: apmail-subversion-users-archive@minotaur.apache.org
Delivered-To: apmail-subversion-users-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 02A0110711
	for <apmail-subversion-users-archive@minotaur.apache.org>;
 Tue, 15 Oct 2013 11:24:10 +0000 (UTC)
Received: (qmail 2394 invoked by uid 500); 15 Oct 2013 11:24:09 -0000
Delivered-To: apmail-subversion-users-archive@subversion.apache.org
Received: (qmail 1865 invoked by uid 500); 15 Oct 2013 11:24:06 -0000
Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:users-help@subversion.apache.org>
List-Unsubscribe: <mailto:users-unsubscribe@subversion.apache.org>
List-Post: <mailto:users@subversion.apache.org>
List-Id: <users.subversion.apache.org>
Delivered-To: mailing list users@subversion.apache.org
Received: (qmail 1858 invoked by uid 99); 15 Oct 2013 11:24:05 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Oct 2013 11:24:05 +0000
X-ASF-Spam-Status: No, hits=1.5 required=5.0
	tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS
X-Spam-Check-By: apache.org
Received-SPF: pass (nike.apache.org: domain of gabriela.gibson@gmail.com
 designates 74.125.82.174 as permitted sender)
Received: from [74.125.82.174] (HELO mail-we0-f174.google.com) (74.125.82.174)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Oct 2013 11:23:58 +0000
Received: by mail-we0-f174.google.com with SMTP id u56so8236547wes.5
        for <users@subversion.apache.org>;
 Tue, 15 Oct 2013 04:23:38 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=20120113;
        h=mime-version:date:message-id:subject:from:to:content-type;
        bh=jMV2wZr7zqCCBxvdU1U3SBVD6Ia7VWGoulmnowD/sP4=;
        b=KPKX8PKuVMF+7hPsqRMsRKDCD7YUkz78mAZxIQBZjlvIjf7CeGFhcOJwXyuyURzyiF
         L+x8K36STeGMIwoVU5OafHd4631yHAk6B9FE0KK/ZXP+Tm9ikX8zEJC1mZ3v98ehStm4
         upg+UVsNNtZJeiYnUk6577XVAowzZDti/vZav1CC2IeiBNjg1HLmu+Sb+iDrSJ3AKv9j
         41vEH7UN3nQOsCVNW2SEGAGK3ttOgHQWoZMKgGc5BnrwJ5s7kNcVqppuKBMAxELadJKr
         UDifwmy9J5lteX0wfki4gcs1OGBE9cJa1QYkIgD1XNHZ4nWLZLFwOenmgvnXtXIzBw1g
         WmtQ==
MIME-Version: 1.0
X-Received: by 10.180.37.227 with SMTP id b3mr19014402wik.24.1381836218221;
 Tue, 15 Oct 2013 04:23:38 -0700 (PDT)
Received: by 10.227.11.136 with HTTP; Tue, 15 Oct 2013 04:23:38 -0700 (PDT)
Date: Tue, 15 Oct 2013 12:23:38 +0100
Message-ID: 
 <CALfVaAQ6PE1=7117HNP3k39==Svs==64FBZ=JEe7A0e_3EA02g@mail.gmail.com>
Subject: How to display the code in my branch without merge changes?
From: Gabriela Gibson <gabriela.gibson@gmail.com>
To: users@subversion.apache.org
Content-Type: multipart/alternative; boundary=e89a8f646ff9ecca7304e8c5d0ec
X-Virus-Checked: Checked by ClamAV on apache.org

--e89a8f646ff9ecca7304e8c5d0ec
Content-Type: text/plain; charset=ISO-8859-1

My goal is to get svn to show the current version of my code,  without the
merged changes added from trunk.

I've tried a lot of different approaches by now (as advertised in svn help
diff), but nothing seems to do the trick.

thanks for any advice,

Gabriela

--e89a8f646ff9ecca7304e8c5d0ec
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div><div>My goal is to get svn to show the current versio=
n of my code,=A0 without the merged changes added from trunk.=A0 <br></div>=
<br></div><div>I&#39;ve tried a lot of different approaches by now (as adve=
rtised in svn help diff), but nothing seems to do the trick.<br>
</div><div><br></div>thanks for any advice,<br><br>Gabriela<br></div>

--e89a8f646ff9ecca7304e8c5d0ec--