SVN 1.6: svn merge marks file as being deleted, but it is not deleted

2013-01-22 Thread Derek Wallace
Hi, We are following the re-book description for long lived branches. So we have a trunk and a feature branch. We regularly keep the feature branch upto date with trunk updates by doing svn merges. We then re-integrate the feature branch back to the trunk. We then follow up with a record only m

svn 1.7.4: svn up --depth immediates not working as expected.

2012-07-06 Thread Derek Wallace
--depth immediates . At revision 131253. As i expected the updated file did not appear. 3. svn up . U mcm_test/ReleaseNotes.txt Updated to revision 131253. As expected the file now appears. Thx Derek --------- Derek Wallace, Director of Release Engineeri

svn 1.7.4: svn up --depth immediates not working as expected.

2012-07-06 Thread Derek Wallace
see is contents of sub- folders updating. > svn info Path: . Working Copy Root Path: /scratch-disk4/derek​.wallace/IVX8000_tru​nk_FPGA_1 URL: svn://dubsvn1/inx800​0-cr1-fpga/ivx8000/t​runk/trunk/data Repository Root: svn://dubsvn1/inx8000-cr1-fpga Repository UUID: baad5aac-ed56-0410-b​

svn 1.7.4: svn up --depth immediates not working as expected.

2012-07-06 Thread Derek Wallace
see is contents of sub- folders updating. > svn info Path: . Working Copy Root Path: /scratch-disk4/derek​.wallace/IVX8000_tru​nk_FPGA_1 URL: svn://dubsvn1/inx800​0-cr1-fpga/ivx8000/t​runk/trunk/data Repository Root: svn://dubsvn1/inx8000-cr1-fpga Repository UUID: baad5aac-ed56-0410-b​

RE: Svn17: concurrent commits in differnt parts of your WC

2012-04-19 Thread Derek Wallace
ill they both not put a lock in the .svn folder beside A. svn up A/X/Y svn up A/P/Q Thx for all your help. Derek -Original Message- From: MARTIN PHILIP [mailto:codematt...@ntlworld.com] On Behalf Of Philip Martin Sent: 19 April 2012 10:47 To: Derek Wallace Cc: us

Svn17: concurrent commits in differnt parts of your WC

2012-04-19 Thread Derek Wallace
checkout. Our WC is very large and this usually takes a long time. Can you clarify if SVN 1.7 does not support concurrent svn commands within a WC. Thx Derek - Derek Wallace, Director of Release Engineering, Intune Networks Ltd Block 9B, Park West

RE: svn: E235000: error when performin a svn switch with SVN 1.7.4

2012-04-18 Thread Derek Wallace
ailed (action == svn_wc_conflict_action_edit || action == svn_wc_conflict_action_delete || action == svn_wc_conflict_action_replace) Aborted (core dumped) -Original Message- From: Derek Wallace Sent: 18 April 2012 12:44 To: Philip Martin Cc: users@subversion.apache.org; Niamh Scott; Derek

RE: svn: E235000: error when performin a svn switch with SVN 1.7.4

2012-04-18 Thread Derek Wallace
00_trunk_FPGA/test/svn_links/derek1.txt' has unexpectedly changed special status [derek.wallace@dublogon1 svn_links]$ Ill continue to try and create the receipe. Thx Derek -Original Message- From: MARTIN PHILIP [mailto:codematt...@ntlworld.com] On Behalf Of Philip Martin Sent: 18 Apr

svn: E235000: error when performin a svn switch with SVN 1.7.4

2012-04-17 Thread Derek Wallace
is issue. Thx Derek --------- Derek Wallace, Director of Release Engineering, Intune Networks Ltd Block 9B, Park West Business Park, Nangor Road, Dublin 12, Ireland. Phone: +353-1-6204737 Fax 353-1-6301914 URL: http://w