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

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

From: John Peacock <jpeacock_at_rowman.com>
Date: 2004-01-26 18:39:33 CET

Charles E. Doucette wrote:
> 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

Merges are always performed against a working copy (WC); you moved your WC to
reflect the TRUNK, then applied changes from the branch to the WC. Until you
commit those changes, nothing has changed in the repository, so you are free to
do whatever you want (within reason).

The correct step at this point in the narrative would have been to revert the
WC, so that the merge was no longer pending, then fix it on the branch prior to
re-attempting the merge. Running 'svn status' would have given you a better
idea what was pending.

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

Did you do 'svn del content/about_stats.aspx' or just delete the file from the
local filesystem? When exactly did you commit? What does 'svn status' say now,
after you have [presumably] committed.

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

Delete it again (using 'svn del') and commit the change. There is no harm in
this (if the file has truly been committed to the repository), since you can
always recover the file should you change your mind again.



John Peacock
Director of Information Research and Technology
Rowman & Littlefield Publishing Group
4720 Boston Way
Lanham, MD 20706
301-459-3366 x.5010
fax 301-429-5747
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:40:14 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.