> I am facing issues when I am trying to cherry pick changes to be
> merged. I followed the procedure given at http://svnbook.red-
> bean.com/en/1.5/svn.branchmerge.advanced.html.
>
> svn --version
> svn, version 1.5.2 (r32768)
>
> Brief explanation:
> =============
> 1. Changes are made on trunk from revisions 37715 to 37720.
>
> 2. Assume a bug is found on the release branch.
>
> 3. I fix the bug in the main trunk in revision 37721.
>
> 4. Now, I need to merge the changes which went into 37721 to my
> release branch (and not changes from 37715 to 37720).
>
> 5. I checked out the release branch. Now I need to merge changes
> that went into 37721 for check.pl
>
> svn info check.pl
> Path: check.pl
> Name: check.pl
> URL: svn+ssh://host/repository/base_svn/branches/
> rel_20080821_branch/script/check.pl
> Repository Root: svn+ssh://host/repository/base_svn
> Repository UUID: 72949e68-6ddc-11dd-9082-94faabab265b
> Revision: 37721
> Node Kind: file
> Schedule: normal
> Last Changed Author: xyz
> Last Changed Rev: 35994
> Last Changed Date: 2008-06-20 15:05:23 +0530 (Fri, 20 Jun 2008)
> Text Last Updated: 2008-06-20 15:05:23 +0530 (Fri, 20 Jun 2008)
> Checksum: 092e639b437fde1310b6e61caca08b33
>
> 6. When I run diff between 37721 and the release version the below
> is displayed. It says only "# change5" was added in revision 37721.
>
> svn diff -c 37721 svn+ssh://host/repository/base_svn/trunk/script/
> check.pl
Actually, that's not the diff between r37721 and the release version.
It's the diff between r37720 and r37721 of the trunk (which may or
may not be the same as what you said).
> Index: check.pl
> ===================================================================
> --- check.pl (revision 37720)
> +++ check.pl (revision 37721)
> @@ -155,3 +155,4 @@
> # change2
> # change3
> # change4
> +# change5
>
> 7. But when I performed the merge it merged all the changes from
> 37715 to 37721 instead of just 37721.
> svn merge -c 37721 svn+ssh://host/repository/base_svn/trunk/script/
> check.pl
>
> <<<<<<< .working
> =======
>
> #Testing
> # change1
> # change2
> # change3
> # change4
> # change5
> >>>>>>> .merge-right.r37721
>
> Please correct me if the procedure followed is wrong.
Your procedure looks ok to me.
Are there changes in line ending? e.g. trunk uses DOS-style line
endings and branch uses UNIX-style? If so, you need to decide on a
line ending style and apply it to all files.
Or maybe the changes just can't be merged. It looks like a conflict
occurred. So you may just need to resolve it manually.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-11-04 20:08:13 CET