Re: How does 'merge' work?

Philip Martin <philip@codematters.co.uk> writes:

> > Right. The immediate thoughts that came to my head were:
> >
> > 1. merge applies patches to your tree.
> > 2. you can't *ever* get a conflict, unless you have local mods.
>
> Huh? The commands above will produce a conflict if you have changes
> to dir_branch that conflict with the -r422:423 changes to dir. Those
> changes can be modifications in your working copy, or they can changes
> that have been committed to dir_branch. In the later case your
> working copy may have no local mods, but you can still get a conflict.

Sorry, I guess now *I'm* confused. :-)

Now I understand why:

 * 'svn up' runs diff3 between your pristine file, the server file,
   and your working file. If you have no local mods, then by
   definition 2 out of 3 of the files are the same, so you won't ever
   get any conflict markers.

 * 'svn merge', runs diff3 between two downloaded tmpfiles and your
   working file. So I guess it *is* still possible to get conflict
   markers. It's just that in Dmitry's particular case, 2 of the 3
   files were indeed still the same.

Am I understanding correctly, Philip?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Oct 21 19:27:34 2002