Re: Problem merging V1.1 to V1.95

On Mar 14, 2007, at 02:58, <Stephane.CLINCKART@ext.ec.europa.eu>
<Stephane.CLINCKART@ext.ec.europa.eu> wrote:

> I have a question about merging.

Ok, let's say that the URL to your project repository $PROJ.

> The problem:
>
> In the trunk I have my project.

$PROJ/trunk

> I have a branche for Version 1.0 (production)

$PROJ/branches/1.0

> Project goes to Version 2.0… it is now on Version 1.95

This is the trunk, right?

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

So... now we're talking about a 1.1 branch. So, hopefully, you made
it this way:

svn cp $PROJ/branches/1.0 $PROJ/branches/1.1

(Let's say that created revision number 100.)

Then you checked out a working copy of $PROJ/branches/1.1 and made
your bugfixes there. (And now let's say that after your fixes the
repository is at revision number 110.)

> 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 looks strange to me is that you're trying to use local folders
for all the parameters. I'm used to using URLs for the first two
parameters.

The way you would do it:

Get a working copy of the trunk that has no other changes in it:

svn co $PROJ/trunk
cd trunk

Now merge in revisions 100 (when you created the 1.1 branch) to 110
(when you finished your fixes) of the 1.1 branch into this working
copy of trunk:

svn merge -r100:110 $PROJ/branches/1.1

Now test the changes, and when you're sure they work, commit them,
noting the revisions that you merged in your log message:

svn ci -m "Merge r100-110 of 1.1 branch into trunk"

-- 
To reply to the mailing list, please use your mailer's Reply To All  
function
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org