<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:st1="urn:schemas-microsoft-com:office:smarttags" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=us-ascii">
<meta name=Generator content="Microsoft Word 11 (filtered medium)">
<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
name="City"/>
<o:SmartTagType namespaceuri="urn:schemas-microsoft-com:office:smarttags"
name="place"/>
<!--[if !mso]>
<style>
st1\:*{behavior:url(#default#ieooui) }
</style>
<![endif]-->
<style>
<!--
/* Font Definitions */
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:"\@SimSun";
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
text-align:justify;
text-justify:inter-ideograph;
font-size:10.5pt;
font-family:"Times New Roman";}
a:link, span.MsoHyperlink
{color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:Arial;
color:windowtext;}
/* Page Definitions */
@page Section1
{size:595.3pt 841.9pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;
layout-grid:15.6pt;}
div.Section1
{page:Section1;}
-->
</style>
</head>
<body lang=ZH-CN link=blue vlink=purple style='text-justify-trim:punctuation'>
<div class=Section1 style='layout-grid:15.6pt'>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>Sorry
for my question. That is my first time using it, so maybe I haven't state my
question clearly. The case is like this:<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'><o:p> </o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>We
have a subversion reposity in North America and want to create a mirror in <st1:City
w:st="on"><st1:place w:st="on">Xi'an</st1:place></st1:City> using svk. So let's
assume that mirror is //mirror and then do:<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>Svk
cp //mirror //local<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>then
we got a copy of the mirror //local, and we use this copy as a server in <st1:City
w:st="on"><st1:place w:st="on">Xi'an</st1:place></st1:City>. So developers in <st1:City
w:st="on"><st1:place w:st="on">Xi'an</st1:place></st1:City> will checkout from
here and commit to //local.<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>Then
maybe in the evening when developer go back, we will do smerge of //mirror and
//local. However, at this time, because there are maybe conflicts among them,
so it will terminate waiting for us to solve the conflict and then will go on
do merge. So in this case there should be a person waiting by to solve
conflicts. As developers are gone, so in fact we can't do this.<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'><o:p> </o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>So
I wonder whether there are methods only recording the conflict
information(such as which file, version, author) and notice relative when
conflict find, smerge go on. In the next day, when developer comes, we solve
the conflicts.<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'><o:p> </o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>Above
is the question case. By now, I have a idea, but not sure of it. The idea is
like this:<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>We
use script language(such as PHP or perl) to pack the svk. When conflicts
happen, we just select the default edit option but do not make any change to
the editing file (which including your version, their version and base version
content), just save it and notice relatives, make log information about this.
Then smerge can run success. In the next day, we can get notice about the
conflict information either from log information or notice report, then solve
the seldom conflicts and commit, smerge, and so on.<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'><o:p> </o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>So
I am wondering whether my idea is feasible. Have anyone got such examples, show
me please if you got about this. Or I am eager for more suggestion about the
question.<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'><o:p> </o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'>Thanks
a lot!!<o:p></o:p></span></font></p>
<p class=MsoNormal align=left style='text-align:left;text-autospace:none'><font
size=2 face=SimSun><span lang=EN-CA style='font-size:10.0pt;font-family:SimSun'><o:p> </o:p></span></font></p>
<p class=MsoNormal><font size=2 face=SimSun><span lang=EN-CA style='font-size:
10.0pt;font-family:SimSun'>Kevin li</span></font><font size=1 face=Arial><span
lang=EN-US style='font-size:9.0pt;font-family:Arial'><o:p></o:p></span></font></p>
</div>
</body>
</html>