[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 01:10:47 CEST

On Jul 21, 2005, at 3:53 PM, Charles Doucette wrote:

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

So, if you did an 'svn revert' to remove the edits created by 'svn
merge', you can rest assured that nothing remembers that the merge
command ever happened.

Until Subversion gets "merge tracking" features, you can think of
'svn merge' as nothing but a shortcut for retyping changes. :-)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jul 22 01:14:22 2005

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