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

merge meta data

From: Charles Doucette <cdoucette_at_cornerstonetech.com>
Date: 2005-07-21 22:53:45 CEST

I was in the middle of implementing some new code on the trunk.
I stopped to implement a time critical feature in old code on a branch.
I started to merge the feature (2 revisions out of 5) from the branch
into the trunk;
but, now I've stopped and backed out those changes. I'd prefer to check
in my new working code and then
merge the whole branch in a separate revision.
 
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?
 
I just tried to do a revision graph (via tortoise) and my preliminary
merge wasn't
reflected in that; so, I thought perhaps it would only be noted after I
did a commit.
 
Should I make a copy of the file, revert it (to clear out any .svn
adminstrative meta data about the merge),
and then restore the copy?
 
Thanks,
Chuck
 
 
  

Charles Doucette
Cornerstone Technology
One Broadway, 16th Floor
Cambridge, MA 02184
617-682-3600 main
617-682-3611 direct
617-758-4285 fax

 

Cornerstone webLogo20.gif
Received on Thu Jul 21 22:58:05 2005

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