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

Re: what creates .mine, .rN, .rN+1 files?

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2007-08-02 03:51:44 CEST

On 8/1/07, Bob DuCharme <bob@snee.com> wrote:
> >when there is a non-conflicting merge of changes
>
> What constitutes conflicting vs. non-conflicting changes?
>
> That really gets to the root of my confusion--I wasn't sure why, when I
> created a conflict on purpose to better understand what was going on,
> those files sometimes appeared and sometimes didn't. I guess it was
> because svn sometimes considered my changes to be conflicting and other
> times (e.g. if I added a new line at the beginning of one copy and a
> different new line at the end of the other copy) non-conflicting.

http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.resolve

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Aug 2 03:50:20 2007

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