Re: unable to reintegrate branch

2010-03-12 Thread Manny DaSilva
DaSilva Cc: users@subversion.apache.org Sent: Fri, March 12, 2010 3:50:54 PM Subject: Re: unable to reintegrate branch On Fri, Mar 12, 2010 at 6:53 PM, Manny DaSilva wrote: > I read article in detail: > http://www.collab.net/community/subversion/articles/merge-info.html > and now I thin

Re: unable to reintegrate branch

2010-03-12 Thread Johan Corveleyn
On Fri, Mar 12, 2010 at 6:53 PM, Manny DaSilva wrote: > I read article in detail: > http://www.collab.net/community/subversion/articles/merge-info.html > and now I think I know why the X/A mergeinfo has asterisk > (/trunk/A:199-202*). Folder X/A has additional sub-folders, other > than 1,2,3 and t

Re: unable to reintegrate branch

2010-03-12 Thread Manny DaSilva
scribed in my first post, the reintegrate simply will not work . From: Manny DaSilva To: Johan Corveleyn Cc: users@subversion.apache.org Sent: Fri, March 12, 2010 10:39:22 AM Subject: Re: unable to reintegrate branch First, thank you for the quick reply. Seco

Re: unable to reintegrate branch

2010-03-12 Thread Manny DaSilva
From: Johan Corveleyn To: Manny DaSilva Cc: users@subversion.apache.org Sent: Fri, March 12, 2010 5:26:51 AM Subject: Re: unable to reintegrate branch On Fri, Mar 12, 2010 at 12:19 AM, Manny DaSilva wrote: > Server at v1.6.9 > CollabNet command-line clie

Re: unable to reintegrate branch

2010-03-12 Thread Johan Corveleyn
On Fri, Mar 12, 2010 at 12:19 AM, Manny DaSilva wrote: > Server at v1.6.9 > CollabNet command-line client at v1.6.9 > TortoiseSVN client at v1.6.7 > 1. Trunk copied to branches/X > 2. Shallow checkout of branches/X creates sparse working-copy: > X/A > X/B > 3. update --set-depth infinity X/A downl

unable to reintegrate branch

2010-03-11 Thread Manny DaSilva
Server at v1.6.9 CollabNet command-line client at v1.6.9 TortoiseSVN client at v1.6.7 1. Trunk copied to branches/X 2. Shallow checkout of branches/X creates sparse working-copy: X/A X/B 3. update --set-depth infinity X/A downloads additional folders from X/A tree: X/A/1 X/A/2 X/A/3 3. merge --dept