RE: "svn log --xml --use-merge-history ..." doesn't include --use-merge-history in the xml output?
> -Original Message- > From: Andrew Reedick [mailto:andrew.reed...@cbeyond.net] > Sent: Wednesday, May 01, 2013 4:24 PM > To: users@subversion.apache.org > Subject: "svn log --xml --use-merge-history ..." doesn't include > --use-merge-history in the xml output? > > Is it just me or is svn log's "--xml" switch not including > "--use-merge-history" information? > > The text output of "svn log --use-merge-history" includes the "Merged via: > r3673" information: > > r3584 | bob | 2013-04-16 15:50:48 -0400 (Tue, 16 Apr 2013) | 1 line > Merged via: r3673 > > Fixed flux capacitor > > > whereas "svn log --xml --use-merge-history" provides no "Merged via: ..." > information: > revision="3584"> > bob > 2013-04-16T19:50:48.762112Z > > kind="file" >action="M">/project/branches/1.1/source/foo.jcl > > Fixed flux capacitor > Bah, never mind. In the xml, the entries for the merged revisions are sub-nodes of the logentry, e.g. bob_porter 2013-05-01T18:43:40.613101Z comment bob_slydell 2013-05-01T17:53:15.616621Z stock option equity sharing program ...
"svn log --xml --use-merge-history ..." doesn't include --use-merge-history in the xml output?
Is it just me or is svn log's "--xml" switch not including "--use-merge-history" information? The text output of "svn log --use-merge-history" includes the "Merged via: r3673" information: r3584 | bob | 2013-04-16 15:50:48 -0400 (Tue, 16 Apr 2013) | 1 line Merged via: r3673 Fixed flux capacitor whereas "svn log --xml --use-merge-history" provides no "Merged via: ..." information: bob 2013-04-16T19:50:48.762112Z /project/branches/1.1/source/foo.jcl Fixed flux capacitor This is with the svn CLI client, version 1.7.9 (r1462340)
Re: SVN Externals 1.6 to 1.7 migration issue
While I have not had the issue you are having, assuming the externals are in the same repository I would highly recommend changing from using the syntax you have to using the carrot (^) operator as it will save you many headaches if your original svn location changes. I.e. use: ^/FOLDER_A FOLDER_C ^/FOLDER_B FOLDER_D Also, I think the specific issue you are having (looking more closely at the error message below) is that AFAIK, SVN does not let you import specific files via externals - you have to do name spaces (aka folders) instead. I would suggest doing one of two things in a batch file that gets run after checkout (manually by the user, though TSVN may be able to give you some automatic client-side scripting): 1. Use "mklink" to create an NTFS file link after the checkout for the file you are trying to relocate. 2. Copy the file from the one directory to the other Or 3. Copy the file as part of the SVN source tree to the other folder; but you'll also have to continuously merge the changes back and forth. #1 is your best option if you want to not change anything at all, but requires that you are running a newer version of Windows than Windows XP. I think Microsoft first started providing the "mklink" utility with Vista; but it could be WIn7, and might also depend on which edition of each of those you have as well. (e.g. it might not be in the Home Premium version, but might be in Pro and Ultimate). #2 is an okay backup if you can't do #1, but you'll need to treat the file as read-only as it will certainly be very much manual effort to maintain. #3 is automatic, but you'd have to ensure the file matches what is at its origin - a bit of a manual effort, but easy to do. $0.02 Ben > > From: "Hutchinson, Steve (UK)" >To: "users@subversion.apache.org" >Sent: Wednesday, May 1, 2013 7:01 AM >Subject: SVN Externals 1.6 to 1.7 migration issue > > >Hi, > >We're been using 1.6 svn externals to manage a FW task. > >In the repository we have a folder structure (which is pretty much defined by >the tools we are using) as below :- > >FOLDER A -> file_a1.txt, file_a2.txt, file_a3.txt >FOLDER B -> file_b1.txt, file_b2.txt, file_b3.txt > >Then using externals we link to those folder to create a WC PROJECT structure >that looks like :- > >PROJECT -> FOLDER C -> file_a1.txt, file_a2.txt, file_a3.txt AND file_b1.txt >PROJECT -> FOLDER D -> file_b1.txt, file_b2.txt, file_b3.txt > >The externals on PROJECT FOLDER we used looked like (not actually using file >protocol, just created for example purposes) :- > >file:///D:/FPGA/SVN_ISSUE/repo/FOLDER_A FOLDER_C >file:///D:/FPGA/SVN_ISSUE/repo/FOLDER_B FOLDER_D >file:///D:/FPGA/SVN_ISSUE/repo/FOLDER_B/file_b1.txt FOLDER_C/file_b1.txt > >Worked ok with 1.6. We get the below error in 1.7 when updating of :- > >External failed: D:\FPGA\SVN_ISSUE\PROJECT\FOLDER_C\file_b1.txt >Error: Cannot insert a file external defined on >'D:\FPGA\SVN_ISSUE\PROJECT' into the >Error: working copy 'D:\FPGA\SVN_ISSUE\PROJECT\FOLDER_C'. > >We have tried a few things (will not share all at this point due to info >overload), but wondered if there were any others that achieve something like >this with 1.7 or could offer some advise ? > >Thanks for any help. > >Regards >Steve H > > >This email and any attachments are confidential to the intended recipient and >may also be privileged. If you are not the intended recipient please delete it >from your system and notify the sender. You should not copy it or use it for >any purpose nor disclose or distribute its contents to any other person. > >MBDA UK Limited, a company registered in England and Wales, registration >number 3144919 whose registered office is at Six Hills Way, Stevenage, >Hertfordshire, SG1 2DA, England. > > > > >
SVN Externals 1.6 to 1.7 migration issue
Hi, We're been using 1.6 svn externals to manage a FW task. In the repository we have a folder structure (which is pretty much defined by the tools we are using) as below :- FOLDER A -> file_a1.txt, file_a2.txt, file_a3.txt FOLDER B -> file_b1.txt, file_b2.txt, file_b3.txt Then using externals we link to those folder to create a WC PROJECT structure that looks like :- PROJECT -> FOLDER C -> file_a1.txt, file_a2.txt, file_a3.txt AND file_b1.txt PROJECT -> FOLDER D -> file_b1.txt, file_b2.txt, file_b3.txt The externals on PROJECT FOLDER we used looked like (not actually using file protocol, just created for example purposes) :- file:///D:/FPGA/SVN_ISSUE/repo/FOLDER_A FOLDER_C file:///D:/FPGA/SVN_ISSUE/repo/FOLDER_B FOLDER_D file:///D:/FPGA/SVN_ISSUE/repo/FOLDER_B/file_b1.txt FOLDER_C/file_b1.txt Worked ok with 1.6. We get the below error in 1.7 when updating of :- External failed: D:\FPGA\SVN_ISSUE\PROJECT\FOLDER_C\file_b1.txt Error: Cannot insert a file external defined on 'D:\FPGA\SVN_ISSUE\PROJECT' into the Error: working copy 'D:\FPGA\SVN_ISSUE\PROJECT\FOLDER_C'. We have tried a few things (will not share all at this point due to info overload), but wondered if there were any others that achieve something like this with 1.7 or could offer some advise ? Thanks for any help. Regards Steve H This email and any attachments are confidential to the intended recipient and may also be privileged. If you are not the intended recipient please delete it from your system and notify the sender. You should not copy it or use it for any purpose nor disclose or distribute its contents to any other person. MBDA UK Limited, a company registered in England and Wales, registration number 3144919 whose registered office is at Six Hills Way, Stevenage, Hertfordshire, SG1 2DA, England.
RE: backlogging with subversion?
> On 29.04.2013 22:56, Daniel Shahaf wrote: > > Cooke, Mark wrote on Mon, Apr 29, 2013 at 15:30:31 +0100: > >>> -Original Message- > >>> From: Ryan Tarrant [mailto:rtarr...@neibenefits.org] > >>> Sent: 29 April 2013 15:19 > >>> To: users@subversion.apache.org > >>> Subject: backlogging with subversion? > >>> > >>> Is there a way to do product backlogging with subversion? I'm > >>> looking for a way to manage tasks associated with projects > >>> where I can prioritize tasks that might hopefully be > >>> something like a plugin or extension of subversion. > >>> > >>> Currently I have subversion running on a linux server and > >>> we're using TortoiseSVN on windows clients to access the > repositories. > >>> > >>> I'm also looking for something that is not a monthly/yearly > >>> fee. I'm already hosting subversion so I would like to also > >>> host the backlog with the projects themselves. > >> Not directly in subversion but we use the Trac tool [1] > which has good > >> integration with subversion and was i) reasonably easy to get going > >> and ii) free. If you want to go apache, the Bloodhound [2] project > >> takes Trac as its base and adds several commononly used > plugins (but > >> is not released as yet). > > Bloodhound had a release while incubating. (I'd be very > surprised if > > they became a TLP without an incubating release.) I'm not > sure whether > > they had a release since then. > > -Original Message- > From: Branko Čibej [mailto:br...@wandisco.com] > Sent: 30 April 2013 19:43 > To: users@subversion.apache.org > Subject: Re: backlogging with subversion? > > We did, the 0.5.3 release came after Bloodhound graduated from > incubation. There has not as yet been a 1.0 release, if that's what > you're looking for. > > -- Brane > > -- > Branko Čibej > Director of Subversion | WANdisco | www.wandisco.com Thanks for the update guys, its obviously time I had another look at bloodhound... ~ mark c
