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

file created in branch and never truly merged shows up in mainline as ghost

From: Charles E. Doucette <cdoucette_at_med-learn.com>
Date: 2004-01-26 18:27:12 CET

I tried to ask about this before but I never got a response.

Let me try to be more succinct.

I'm running Subversion 0.35.1 (client and server) on Windows 2K.

I created a file on a branch called about_stats.aspx.

After merging that file from the branch to the mainline, I realized
it wouldn't work as-is and had to be split into two. I tried to rename
the file but it wouldn't let me because I hand't committed it since
merging/copying from the branch. Rather than checking in the initial
copy from the branch and then fixing the problem in the next revision,
I made a copy of the file, deleted the original, and then added each
half of the old file as new files.

Now, the mainline still has content/about_stats.aspx as well
as about_stats1.aspx and about_stat2.aspx.

There is no log file entry describing how about_stats.aspx was
created in the main-line.

I suppose I can try to delete it again; but, if I deleted it after
my attempted merge (and before committing the merged changes)
then why do I have to delete it again?

Thanks for any light that people can shed on this situation.

Chuck

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Jan 26 18:29:17 2004

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