subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Giulio Troccoli <Giulio.Trocc...@uk.linedata.com>
Subject RE: strange problem with subversion merge
Date Tue, 02 Mar 2010 11:32:08 GMT
>


Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851    VAT Reg No 778499447

-----Original Message-----


> From: J. Bakshi [mailto:joydeep@infoservices.in]
> Sent: 02 March 2010 11:17
> To: users@subversion.apache.org
> Subject: strange problem with subversion merge
>
> Dear list,
>
> Greetings to all of you. Hope you all are well.
>
> I have come back again to discuss on svn merge which is not
> working at all here. The version running at server is
>
> ````````````
> svn, version 1.5.1 (r32289)
> compiled Aug 6 2009, 16:55:38
> `````````````````
>
> The client pc has
>
> ````````````````````````
> svn, version 1.6.6 (r40053)
> compiled Nov 1 2009, 12:15:31
> ```````````````````
>
> I have done a checkout of a repo at client and then start
> making trunk and branches
>
> [1] svn co https://192.168.1.1/repos/testrepo ./
>
> [2] cd testrepo
>
> svn mkdir trunk branches
> svn mv folder1 folder2 folder3 trunk/
> svn commit -m "creating trunk and placing files/folder in it"
>
> till now everything is ok
>
> [3] Now making a branch
>
> svn copy trunk branches/mybranch
> svn up
>
> all is OK.
>
> [4] and now merging. I have already changed
> branches/mybranch/folder1/file1 and commit successfully. "svn
> diff -r 475:476" reports the changes I made. BUT
>
> ````````````````
> 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.
>

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.


Mime
View raw message