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

Re: merge meta data

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-07-22 17:43:36 CEST

On Jul 22, 2005, at 10:17 AM, Dale Worley wrote:

>> 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.

That's no different than any other scheduling operation you might run
by hand. 'svn add' and 'svn rm' both change the .svn/entries file,
as does 'svn copy URL .'

I'm just pointing out that there's truly nothing 'svn merge' does
that you couldn't have done manually, either by editing files, or
running simpler svn commands. And all of it is 100% revertible,
leaving no trace in the working copy.

---------------------------------------------------------------------
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:47:49 2005

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