[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Betr.: how to avoid text and tree conflict

From: su heng <ste.suheng_at_gmail.com>
Date: Mon, 04 Apr 2011 22:31:17 +0800

Hi Jan,

  Please kindly refer to my below comments.

Su Heng

On Mon, 2011-04-04 at 16:03 +0200, Jan Keirse wrote:
> su heng <ste.suheng_at_gmail.com> schreef op 04/04/2011 15:41:38:
> > Hi,
> >
> > I read the SVN book, as there are three type conflicts: text, tree and
> > properties conflict. However, I wanna know why it is a conflict. For
> > example, if there is a text conflict when I do merging code, I just know
> > there is an conflict but don't know why it is a conflict.
> >
> > So could u provide me some resource or hints what are the judge rules
> > for SVN to address it is a conflict, in this case, I can avoid more
> > conflict when I'm coding or merging. I concert the text and tree
> > conflict more.
> >
> Start version is A. B and C are changes to A.
> Change B says line 3 is 'cool!'
> Change C says line 3 is 'boring!'
> If you want to merge change B and C there's a conflict, because one change
> says the opposite of the other.
[suheng] : thanks, However, your example just covers one condition. Can
you give me a basic conflict rule policy of SVN so I can conclude all
  As your example, can I thought whenever a low revision(C) merge to a
high revision(when B merge to A, A will be A+1), a text conflict will be
pop up whatever the line is changed?
  In your example, the precondition is file a is revision A, then the
same file under change B is revision B = A + n(n>0), and same file under
change C is revision C = B + n(n>0), when change B is merged to A, we
must commit it firstly(at this time revision A will be rise to A+n > B
&& A+n > C, then do another merge I mean change C will be merged in A+n,
then conflict out.
  I think if C is a branch of from revision B+n(n>1) but not A, when we
merge C+n(n>1) won't involve conflict, right?

  Hmm...I think it has little confusing. you can ignore my explain, just
suggest me the basic conflict policy is appreciated.^_^

> Similar:
> Start filename is A .
> Change B says A should be renamed to B.
> Change C says A should be renamed to C.
> If you want to merge B and C what should the filename be? B or C?
[suheng] : thanks for your explain.
> Kind Regards,
> ICT-AFDELING ? software quality & systems ? software engineer
> **** DISCLAIMER ****
> http://www.tvh.com/newen2/emaildisclaimer/default.html
> "This message is delivered to all addressees subject to the conditions
> set forth in the attached disclaimer, which is an integral part of this
> message."

QQ :    49757862
MSN:    suh.steven_at_hotmail.com
Mobile: (0512)60780554
Received on 2011-04-04 16:33:51 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.