Hi,
I have a question about merging.
The problem:
In the trunk I have my project.
I have a branche for Version 1.0 (production)
Project goes to Version 2.0… it is now on Version 1.95
In my branche I have done some bug correction to Version 1,
let says it's now Version 1.1 (Modify files, adding files, delete files, move some folders)
I want now to merge bug correction made in V1.1 to Version 1.95.
--> I use svn merge to do that.
Svn merge local_folder_to_branche_version_1.1 local_folder_to_trunk_version_1.95 local_folder_to_trunk_version_1.95
But when I do that I get "errors" like "Skipped missing target"
Deleted folder in "local_folder_to_branche_version_1.1" are not deleted in destination merged folder local_folder_to_trunk_version_1.95.
Added files are not "copied" to merged version.
It looks strange for me.
What is wrong? Do I bad understand the merge goal? Do I use a bad command? Bad parameters???
Thanks for help.
Stephane
Received on Wed Mar 14 08:58:25 2007