Update with conflicts

------=_Part_1007_1708515913.1366354956213
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I'm using RapidSVN (0.12 on Linux) and I can use the View / 'Refresh with
Update' to view a list of items that are newer in the repository than my
working copy.

When I do an update and a file results in a conflict, RapidSVN shows the
conflict, as expected, with a "!" indicator. And, I see the 4 conflict
files and the modified file with the 'mine' indicators etc.

I'd like to interactively merge the conflicts before the file is modified
so I configured meld in RapidSVN, but there was no change in the
update-with-conflicts behavior.

I'm wondering if I have a configuration problem or if RapidSVN doesn't do
interactive merge for update-with-conflicts.

-Jim

------------------------------------------------------
http://rapidsvn.tigris.org/ds/viewMessage.do?dsForumId=671&dsMessageId=3053651

To unsubscribe from this discussion, e-mail: [[email protected]].
------=_Part_1007_1708515913.1366354956213
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr">I&#39;m using RapidSVN (0.12 on Linux) and I can use the V=
iew / &#39;Refresh with Update&#39; to view a list of items that are newer =
in the repository than my working copy. =A0<div><br></div><div style>When I=
 do an update and a file results in a conflict, RapidSVN shows the conflict=
, as expected, with a &quot;!&quot; indicator. And, I see the 4 conflict fi=
les and the modified file with the &#39;mine&#39; indicators etc.</div>
<div style><br></div><div style>I&#39;d like to interactively merge the con=
flicts before the file is modified so I configured meld in RapidSVN, but th=
ere was no change in the update-with-conflicts behavior.</div><div style>
<br></div><div style>I&#39;m wondering if I have a configuration problem or=
 if RapidSVN doesn&#39;t do interactive merge for update-with-conflicts.</d=
iv><div style><br></div><div style>-Jim</div></div>

------=_Part_1007_1708515913.1366354956213--