You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Fossen Charles-KWT678 <ch...@motorola.com> on 2007/06/21 13:51:51 UTC
Merge skipped files in added dir
I have spent a day searching through the archives looking for info on my
merge question.
I am doing a merge from a vendor branch to the trunk.
The change set includes a new directory tree of files.
svn adds the new directories but skips the files under those
directories.
My svn client is 1.4.2. The server is 1.2.x.
Example follows.
Is this expected behavior?
Thanks,
chuckf
A osdk/buildroot/build_armeb_nofpu/root
A osdk/buildroot/build_armeb_nofpu/root/tmp
A osdk/buildroot/build_armeb_nofpu/root/opt
A osdk/buildroot/build_armeb_nofpu/root/proc
A osdk/buildroot/build_armeb_nofpu/root/root
A osdk/buildroot/build_armeb_nofpu/root/www
A osdk/buildroot/build_armeb_nofpu/root/www/asp
Skipped
'osdk/buildroot/build_armeb_nofpu/root/www/asp/internet_ddns.asp'
Skipped
'osdk/buildroot/build_armeb_nofpu/root/www/asp/control_panel_certificate
.asp'
More skips...
Skipped 'osdk/buildroot/build_armeb_nofpu/root/www/common.js'
Skipped
'osdk/buildroot/build_armeb_nofpu/root/www/configured_networks.asp'
A osdk/buildroot/build_armeb_nofpu/root/www/images
Skipped
'osdk/buildroot/build_armeb_nofpu/root/www/images/internet_0.jpg'
Skipped
'osdk/buildroot/build_armeb_nofpu/root/www/images/btn_finish.gif'
More skips...
Skipped 'osdk/buildroot/build_armeb_nofpu/root/www/images/voip_1.jpg'
Skipped
'osdk/buildroot/build_armeb_nofpu/root/www/images/btn_cancel_2.gif'
A osdk/buildroot/build_armeb_nofpu/root/www/cgi-bin
Skipped 'osdk/buildroot/build_armeb_nofpu/root/www/cgi-bin/sysconf.cgi'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/www/cgi-bin/ssiget'
A osdk/buildroot/build_armeb_nofpu/root/www/css
Skipped 'osdk/buildroot/build_armeb_nofpu/root/www/css/moto.css'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/www/index.asp'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/www/login.asp'
A osdk/buildroot/build_armeb_nofpu/root/lib
A osdk/buildroot/build_armeb_nofpu/root/lib/modules
A osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel
A osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/net'
A
osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendora
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendor
a/wmdev.ko'
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendor
a/ipc.ko'
More skips...
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendor
a/rdeth.ko'
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/misc'
A
osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendorb
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendor
b/ebt_limit.ko'
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendor
b/ebt_log.ko'
More skips...
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendor
b/ebt_ip.ko'
Skipped
'osdk/buildroot/build_armeb_nofpu/root/lib/modules/kernel/drivers/vendor
b/ebtable_filter.ko'
A osdk/buildroot/build_armeb_nofpu/root/bin
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/lighttpd'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/ebtables'
More skips...
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/cat'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/login'
A osdk/buildroot/build_armeb_nofpu/root/bin/certinfo
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/sed'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/rmdir'
More skips...
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/rm'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/w_mgr'
A osdk/buildroot/build_armeb_nofpu/root/bin/cneomi.sh
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/fwupgrade'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/ddns_client'
More skips...
'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/getopt'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/cp'
A osdk/buildroot/build_armeb_nofpu/root/bin/opmode_sw.sh
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/bridge.sh'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/uname'
More skips...
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/addentry'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/sh'
A osdk/buildroot/build_armeb_nofpu/root/bin/fqdn_ip_lkup
A osdk/buildroot/build_armeb_nofpu/root/bin/ipkg-check.sh
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/chown'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/echo'
Skipped 'osdk/buildroot/build_armeb_nofpu/root/bin/rfupgrade'
Re: Merge skipped files in added dir
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jun 21, 2007, at 17:23, Fossen Charles-KWT678 wrote:
>>> I have spent a day searching through the archives looking for info
>>> on my merge question.
>>>
>>>
>>>
>>> I am doing a merge from a vendor branch to the trunk.
>>>
>>> The change set includes a new directory tree of files.
>>>
>>> svn adds the new directories but skips the files under those
>>> directories.
>>>
>>> My svn client is 1.4.2. The server is 1.2.x.
>>>
>>> Example follows.
>>>
>>>
>>>
>>> Is this expected behavior?
>
>> No, it's not. It usually means you've performed the wrong merge. Can
>> you show us the merge command you used?
>
> svn merge -r 32118:32621 https://svn.repo.com/embedded/vendor/trunk .
If "." is a working copy of trunk, and if your revision numbers are
correct, then that should have worked. I'm sorry I took so long to
reply, but I'm afraid I also don't have any great suggestions at this
point. Are you still experiencing the issue? Can you show us the
exact error message your receive?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: Merge skipped files in added dir
Posted by Fossen Charles-KWT678 <ch...@motorola.com>.
>> I have spent a day searching through the archives looking for info
>> on my merge question.
>>
>>
>>
>> I am doing a merge from a vendor branch to the trunk.
>>
>> The change set includes a new directory tree of files.
>>
>> svn adds the new directories but skips the files under those
>> directories.
>>
>> My svn client is 1.4.2. The server is 1.2.x.
>>
>> Example follows.
>>
>>
>>
>> Is this expected behavior?
>No, it's not. It usually means you've performed the wrong merge. Can
>you show us the merge command you used?
svn merge -r 32118:32621 https://svn.repo.com/embedded/vendor/trunk .
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Merge skipped files in added dir
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jun 21, 2007, at 08:51, Fossen Charles-KWT678 wrote:
> I have spent a day searching through the archives looking for info
> on my merge question.
>
>
>
> I am doing a merge from a vendor branch to the trunk.
>
> The change set includes a new directory tree of files.
>
> svn adds the new directories but skips the files under those
> directories.
>
> My svn client is 1.4.2. The server is 1.2.x.
>
> Example follows.
>
>
>
> Is this expected behavior?
No, it's not. It usually means you've performed the wrong merge. Can
you show us the merge command you used?
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org