Sure, here it goes
[x] svn update (in trunk)
[x] mvn clean install
[x] svn info
[x] svn ls
https://grizzly.dev.java.net/svn/grizzly/branches/war-deployer/
[x] svn co
https://grizzly.dev.java.net/svn/grizzly/branches/war-deployer/
[x] mvn clean install (in branch)
[x] svn merge -r 2505:2562
https://grizzly.dev.java.net/svn/grizzly/branches/war-deployer (in trunk)
[x] mvn clean install (in trunk, with merge)
[x] svn commit -m "merged"
Where -r 2505:2562 are respectively create branch and last commit in branch.
HTH,
Hubert
On Sat, Feb 28, 2009 at 8:51 PM, Survivant 00 <survivant00_at_gmail.com> wrote:
> thanks
>
> can you tell me how you did it.. like that I'll be able next time :)
>
> 2009/2/28 Hubert Iwaniuk <neotyk_at_kungfoo.pl>
>
> Committed revision 2566.
>> Merged war-deployer brunch with trunk.
>>
>> Hubert
>>
>>
>>
>> On Sat, Feb 28, 2009 at 1:44 AM, Survivant 00 <survivant00_at_gmail.com>wrote:
>>
>>> there is someone that cna help me to merge my branch : war-deployer to
>>> the trunk please ?
>>>
>>>
>>> I have the client TortoiseVSN On windows, but the doc is not update to
>>> date, and I don't want to impact the trunk if I failed.
>>>
>>> All the code is committed.
>>>
>>> thanks
>>>
>>
>>
>