strange merge situation - file deleted after initial merge and before commit is created in repos (but missing from logs)
From: Charles E. Doucette <cdoucette_at_med-learn.com>
Date: 2004-01-19 22:14:45 CET
In order to merge our clients updates to our site, I created a branch
Then, I tried to merge their changes into the main-line of development.
They had created a new directory (content), and had added new files such as:
content/about_stats.aspx
After merging their changes, I discovered what they had done wouldn't work.
content/about_stats1.aspx and content/about_stats2.aspx.
I tried to rename content/about_stats.aspx; but, since I hand't checked
Now, my original development directory is fine (without the deleted file - even after updating); but, whenever I do
Any insight is appreciated.
Thanks,
p.s. I'll hold-off deleting the file from the repository in case
---------------------------------------------------------------------
|
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.