subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "J. Bakshi" <joyd...@infoservices.in>
Subject Re: strange problem with subversion merge
Date Tue, 02 Mar 2010 11:55:34 GMT
On 03/02/2010 05:02 PM, Giulio Troccoli wrote:

<snip>
>> ````````````````
>> svn merge -r 475:476 trunk/
>> `````````````````
>> just returns null value. It should merge the changes I made at
>> branches/mybranch/folder1/file1 to trunk/folder1/file1. Have
>> I missed something ? Please suggest.
>>
>>     

</snip>
> I understand you want to merge the changes you have done in the branch to the trunk.
If that's the case then from the branch you use the --reintegrate option.
>
> The merge command you issued merges the changes between 475 and 476 done to trunk into
the directory you are in. Since the changes happened on the branch it's correct that it doesn't
merge anything.
>
>   


Hello,

Thanks a lot for your response. I am afraid but I am not fully
understand the logic. Which I am following is collected from net and I
have just doing the same. I admit I don't know the in-depth about how
merging works. It might be interesting that I am now getting something
new than the empty return as before. Please fine below

``````````````````
svn diff -r 488:489
Index: branches/bug/typo3conf/localconf.php
===================================================================
--- branches/bug/typo3conf/localconf.php (revision 488)
+++ branches/bug/typo3conf/localconf.php (revision 489)
@@ -1,9 +1,12 @@
<?php

-qqwq
-wq
-wqq
-qw
+wew
+wew
+ew
+wew
+
``````````````````````

The modification is done at branches/bug/typo3conf/localconf.php. Now I
try to merge it to trunk

```````````````
svn merge --dry-run -r 488:489 branches/bug/ trunk/

--- Merging r489 into 'trunk':
C trunk/typo3conf/localconf.php
Summary of conflicts:
Text conflicts: 1
````````````

Why the conflict now ? I have provide both source and target and
confirmed the changes with "svn diff" !!! What is wrong from my end ?
Please enlighten me.
Once again thanks for your kind help.


-- 
জয়দীপ বক্সী


Mime
View raw message