> Thanks a lot. I have gone through the link you have provided
> and now the merge is working well :-) That link gives very
> good clarification. Do you have any experience to work with
> esvn or aptana ? I don't know how merging works with these
> GUI based tool and looking for the info.
> Anyway
On 03/03/2010 11:04 AM, J. Bakshi wrote:
> On 03/02/2010 07:48 PM, Giulio Troccoli wrote:
>
>>
>>
>>>
>>> svn merge -r 475:476 trunk/
>>> `
>>>
>>>
>>
>>
>>>
>>> svn merge --dry-run
On 03/02/2010 07:48 PM, Giulio Troccoli wrote:
>
>>
>> svn merge -r 475:476 trunk/
>> `
>>
>
>>
>> svn merge --dry-run -r 490:491 trunk/typo3conf/ branches/bug/
>> Skipped missing target: 'branches/bug/localconf.ph
>
> svn merge -r 475:476 trunk/
> `
>
> svn merge --dry-run -r 490:491 trunk/typo3conf/ branches/bug/
> Skipped missing target: 'branches/bug/localconf.php'
> ```
But these commands are not the same.
>From your previous em
--
>
>
>
>> From: J. Bakshi [mailto:joyd...@infoservices.in]
>> Sent: 02 March 2010 11:56
>> To: Giulio Troccoli
>> Cc: users@subversion.apache.org
>> Subject: Re: strange problem with subversion merge
>>
>> On 03/02/2010 05:02 PM, Giulio Tro
; To: Giulio Troccoli
> Cc: users@subversion.apache.org
> Subject: Re: strange problem with subversion merge
>
> On 03/02/2010 05:02 PM, Giulio Troccoli wrote:
>
>
> >>
> >> svn merge -r 475:476 trunk/
> >> `
> >&
On 03/02/2010 05:02 PM, Giulio Troccoli wrote:
>>
>> 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.
>>
>>
t; 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
>
>
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
``
