> From: Ben Collins-Sussman [mailto:sussman@collab.net]
>
> > Although I know it isn't automatic yet, my question is where is the
> > knowledge kept
> > that reflects my preliminary merges? Is it in the svn
> > administrative directories?
> > Would that meta be committed even if the changes from the merges
> > weren't?
>
> Subversion doesn't record merges in any way at all. If you run the
> 'svn merge' command, all you end up with is a bunch of local changes
> in your working copy. At that point, Subversion has no idea where
> they came from: you could have typed all those changes by hand, for
> all it knows.
There is one minor exception, in that if "svn merge" sees a file has been
added on one leg of the merge and needs to add it to your WC, it does a
Subversion copy from the other leg into your WC. So where that file came
from is logged by Subversion into its metadata.
And we have found in practice that using the "svnmerge" wrapper to "svn
merge" does a reasonably good job of keeping metadata about merges. It
stores the metadata in Subversion properties in your WC, so if you revert
your WC, it resets the metadata correctly.
Dale
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 22 17:35:58 2005