Mailing-List: contact users-help@subversion.apache.org; run by ezmlm
Precedence: bulk
Received-SPF: pass (nike.apache.org: domain of ctgreybeard@gmail.com
 designates 209.85.161.43 as permitted sender)
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:reply-to:date:message-id:subject:from:to:content-type;
        b=Vf/pFxruJY7FX0fGitjXJPglzKRS/UywWf+WsR1ApdFF/VfJHE2INMmU7yK/2QXDoQ
         ReLbDaCS59N3ugbYbEgT40dZdp0wdrFsJqlkV14Q0fpVW3fA8uQSSUJzI6a5vO8TNnn0
         iyGzmr+Q+T/RV3+g4R/6yoXQyZa7O+gFPoc2c=
MIME-Version: 1.0
Reply-To: greybeard@pobox.com
Date: Sun, 23 Jan 2011 18:32:32 -0500
Message-ID: <AANLkTi=VEFMO+FqoXFQDA_zr2UghkVYgxZyaokShgzC2@mail.gmail.com>
Subject: Merge confusion ...
From: Bill Waggoner <ctgreybeard@gmail.com>
To: users@subversion.apache.org
Content-Type: multipart/alternative; boundary=20cf3054a511bec4ea049a8be5a3

--20cf3054a511bec4ea049a8be5a3
Content-Type: text/plain; charset=UTF-8

This is a confused newbie question about merge.  I'll try to be brief ...

I have a script, index.php, that I updated at R8 to add some code.  We are
now at R13 or so ... Someone else, outside of SVN, updated the source file
with changes that did not include my changes at R8.  Now I have a copy of
their updated file, how (or can I?) use MERGE to take my changes (7:8) and
insert them into the new source?  The changes are not in conflict at all.

TIA,
Bill W

--20cf3054a511bec4ea049a8be5a3
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

This is a confused newbie question about merge. =C2=A0I&#39;ll try to be br=
ief ...<div><br></div><div>I have a script, index.php, that I updated at R8=
 to add some code. =C2=A0We are now at R13 or so ... Someone else, outside =
of SVN, updated the source file with changes that did not include my change=
s at R8. =C2=A0Now I have a copy of their updated file, how (or can I?) use=
 MERGE to take my changes (7:8) and insert them into the new source? =C2=A0=
The changes are not in conflict at all.</div>
<div><br></div><div>TIA,</div><div>Bill W</div>

--20cf3054a511bec4ea049a8be5a3--