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

Re: First time use of merge reintegrate

From: Mark Phippard <markphip_at_gmail.com>
Date: Mon, 18 Aug 2008 15:26:35 -0400

On Mon, Aug 18, 2008 at 3:14 PM, Rohan Joseph <rohanjoseph_at_gmail.com> wrote:
> Thanks Mark. That makes sense. The merge-syntax you provided is
> correct and - the merge worked! Why did this merge work, and why did
> the merge with the --reintegrate command fail?

The command did not fail, it flagged a conflict as it should have. I
am not familiar with the internals of how SVN's merge algorithm works,
but I have also observed it not creating conflicts in times where I
thought it might. Granted, not on the same merge command though.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-18 21:26:57 CEST

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