Re: Using subversion (or something else?)

2010-05-22 Thread Gary
Les Mikesell wrote: > On 5/21/2010 8:52 AM, Gary . wrote: >> Accessing the jg project is fine: >> j...@work ~/work/svntest >> $ svn list file:///mnt/h/svn/jg >> .bashrc [...] > Which has nothing to do with the location you tried to use in the > failing import. No. I just wanted to show that the b

Re: Using subversion (or something else?)

2010-05-22 Thread Ryan Schmidt
On May 22, 2010, at 06:24, Gary wrote: > Les Mikesell wrote: >> > >> You can only svn copy with url's pointing to within the same >> repository. Or you can do it locally in a checked out working copy and >> commit it back. > > Ah okay. Thanks. Will try again next week when I am back at > work.

Re: Using subversion (or something else?)

2010-05-22 Thread Gary
Ryan Schmidt wrote: > On May 22, 2010, at 06:24, Gary wrote: >> , >> | $ svn copy http://svn.example.com/repos/vendor/libcomplex/1.0 \ >> >> |http://svn.example.com/repos/calc/libcomplex\ >>

svn "XML data was not well-formed"

2010-05-22 Thread Régis Décamps
Hi, I'm trying to check out the code of songbird with svn co http://publicsvn.songbirdnest.com/client/trunk songbird It always fail with "les données XML sont mal formatées". This happens wherever my workspace is. If I run the same command with another local account, it works. So I supposed one

Re: Reintegrate a branch issue

2010-05-22 Thread Régis Décamps
On 21 mai, 23:57, "Michael Cole" wrote: > Hello, > > I created a development branch and I'm trying to reintegrate that branch > back into the trunk.  My question is two-fold: > > 1)      After reintegration, I can delete my branch, correct? Yes indeed. In the worse case, we can still check out

Re: Trying to revive a repo

2010-05-22 Thread Régis Décamps
On 19 mai, 19:22, Kevin Korb wrote: > We were backing up the repository files, but not a dump.  We lost the server > and we're trying to restore the repo. > > When we run a svnadmin verify, we get this back... > > * Verified revision 0. > svnadmin: Revision file lacks trailing newline > > The fi

RE: Reintegrate a branch issue

2010-05-22 Thread Michael Cole
Thank you. I believe I will downgrade my client. It's unfortunate that the newer versions don't have an option to work successfully with older server versions. What kind of advantages does merge tracking offer? -Original Message- From: Régis Décamps [mailto:deca...@users.sf.net] Sent

Certain files always appear in my reintegrate merges

2010-05-22 Thread Jacob Weber
Here's the situation: I just did a reintegrate from the HEAD of branch_X into trunk. I committed everything. At this point, the two branches should be identical. Afterwards, I didn't change either branch, except to commit the reintegrate itself to trunk, and to commit a record-only merge to bra

Re: Certain files always appear in my reintegrate merges

2010-05-22 Thread Jacob Weber
Forgot to mention: I'm using SVN 1.6.11 client and 1.6.5 server. Jacob On May 22, 2010, at 7:31 PM, Jacob Weber wrote: > Here's the situation: I just did a reintegrate from the HEAD of branch_X into > trunk. I committed everything. > > At this point, the two branches should be identical. After