RE: Win7 Integartion issue

[David Aldrich]

I suggest you look at recent posts on the official TortoiseSVN users mailing 
list.

us...@tortoisesvn.tigris.org

David

svn client proxy settings

[David Aldrich]

Hi

On our internal network svn clients can access our svn server directly but some 
clients are accessing the svn server via our proxy server. We want to stop svn 
clients going via the proxy for reasons of efficiency and reliability.

I think that in instances where the proxy is used, the proxy is not specified 
in the local svn 'servers' file. So I don't understand why the proxy is used.

Our PCs also run Internet Explorer and that browser is set to use the proxy.  
Is it possible that svn clients detect proxy settings from the local Internet 
Explorer settings (this is not mentioned in the svn red book) ?

Best regards

David

Regarding SVN installation.

[Gaurav Lakhani]

Dear Sir

I am new to SVN.I want to install it in my organisation.
We already have CCnet,Bugtracker.net installed with VSS2005.
Now we want to replace VSS with SVN.
Environment is:
OS is Windows 32 bit.
Visual studio used are VS 2008,2005,2003 and also vb6.0

But i am confused as i don't know which version to download of SVN that is
compatible with tortoise svn and also with Ankh SVN.
Please Advice which versions should i download and from where.

-- 
Thanks and Regards
Gaurav Lakhani

Re: Rearranging archive

[Steve Kelley]

Thanks for the response. This I can do. However, what I want is to get 
all of the history etc. into the trunk so that it looks like the 
repository was created properly to start with. The svn mkdir and mv 
commands do not work in the repository itself, only in the working copy. 
Is it possible to re-arrange the existing repository and preserve all of 
the history/revisions. Something like:


svnadmin dump proj1 > dumpfile
svnadmin create new/proj1_with_trunk
svnadmin load new/proj1_with_trunk < dumpfile

I have tried the above but can't seem to get the job done. Is there a way?

Ryan Schmidt wrote:

On Apr 27, 2010, at 18:43, Steve wrote:

  

I have inherited an archive



a repository?

  

that was created without using the recommended directory structure hosted on a 
Windows XP box set up with Apache and SSL. Everything works fine except our 
project is now to the point where I want to start using tags. Since the 
archives were created without a 'trunk' I don't have a good way to do this. 
What I would like to do is fix the archive so that the directory structure 
looks like the recommended. I have not been able to find a way to move the 
entire repository into a new directory tree so that the code files are in a 
'trunk' directory.

What I have now is:
archive
  proj1
  project files
  proj2
  project files
etc.

What I want to move to is:
new archive
  proj1
  trunk
  project files
  tags
  branches
  proj2
  trunk
  project files
  tags
  branches
etc.

I'm sure I'm trying to make this harder than it actually is but so far I'm 
striking out.



Yup, it's a simple set of svn mkdir and svn mv commands. Consider this 
pseudo-bash-code:

foreach PROJECT
svn checkout url://to/repo/PROJECT
cd PROJECT
svn mkdir trunk branches tags
foreach ITEM that is not trunk branches or tags
svn mv ITEM trunk
done
svn commit -m "create trunk branches tags for PROJECT"
cd ..
rm -rf PROJECT
done
  




No virus found in this incoming message.
Checked by AVG - www.avg.com 
Version: 9.0.814 / Virus Database: 271.1.1/2838 - Release Date: 04/27/10 02:27:00


  


--
Steve Kelley
106 Oklahoma Ave.
Oak Ridge, TN 37830
865 482 7131

RE: Common name for transaction and revision object

[Giulio Troccoli]

>


Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851VAT Reg No 778499447

-Original Message-


> From: Geoff Rowell [mailto:geoff.row...@gmail.com]
> Sent: 22 April 2010 14:21
> To: Giulio Troccoli
> Cc: users@subversion.apache.org
> Subject: RE: Common name for transaction and revision object
>
> Giulio Troccoli  wrote:
> >
> > I'm writing the hooks for a new repository in Perl and I'm
> exploring
> > using
> OO Perl. In both pre- and post-commit hooks I need the list
> of files, the author and other similar information. My idea
> was to define a class and create an instance of that class
> given either the transaction number adn repository path or
> the revision number and the repository URL. The 'new'
> function will then initialise all the information I need
> calling either svnlook or svn. For instance:
> >
> > my $transaction = new Transaction($txn, $repo_path);
> >
> > Or
> >
> > my $commit = new Commit($rev, $repo_url);
> >
> > As you can see they are almost the same, so it would be
> nice to have a
> single class (I could then check the second parameter to see
> if it's a URL or a path and do things accordingly). But I
> cannot come up with a single name that would encompass both,
> and that's what I'm asking the list.
> >
> > So, any suggestions?
>

Sorry, for posting again but I haven't received any suggestions regarding the 
name. Nobody can come up with anything? Really?

G

RE: Rearranging archive

[Bob Archer]

> Thanks for the response. This I can do. However, what I want is to get
> all of the history etc. into the trunk so that it looks like the
> repository was created properly to start with. The svn mkdir and mv
> commands do not work in the repository itself, only in the working copy.

Sure they do... check out svn help mv:

  SRC and DST can both be working copy (WC) paths or URLs:
WC  -> WC:   move and schedule for addition (with history)
URL -> URL:  complete server-side rename.
  All the SRCs must be of the same type.


The mv will retain all the history. 

If you are on windows you can use the TortoiseSVN repo browser. It makes stuff 
like this very easy.

BOb

RE: Common name for transaction and revision object

[Cooke, Mark]

> > From: Geoff Rowell [mailto:geoff.row...@gmail.com]
> > Sent: 22 April 2010 14:21
> > To: Giulio Troccoli
> > Cc: users@subversion.apache.org
> > Subject: RE: Common name for transaction and revision object
> >
> > Giulio Troccoli  wrote:
> > >
> > > I'm writing the hooks for a new repository in Perl and I'm
> > exploring
> > > using
> > OO Perl. In both pre- and post-commit hooks I need the list
> > of files, the author and other similar information. My idea
> > was to define a class and create an instance of that class
> > given either the transaction number adn repository path or
> > the revision number and the repository URL. The 'new'
> > function will then initialise all the information I need
> > calling either svnlook or svn. For instance:
> > >
> > > my $transaction = new Transaction($txn, $repo_path);
> > >
> > > Or
> > >
> > > my $commit = new Commit($rev, $repo_url);
> > >
> > > As you can see they are almost the same, so it would be
> > nice to have a
> > single class (I could then check the second parameter to see
> > if it's a URL or a path and do things accordingly). But I
> > cannot come up with a single name that would encompass both,
> > and that's what I'm asking the list.
> > >
> > > So, any suggestions?
> >
> 
> Sorry, for posting again but I haven't received any 
> suggestions regarding the name. Nobody can come up with 
> anything? Really?
> 
> G
> 
What about "Transaction" or "BaseTransaction" or "TransactionBase"?  A
commit is just a specific transaction anyway.

What does the other poster use in the framework he pointed you to?

~ mark c

RE: Regarding SVN installation.

[Bob Archer]

> I am new to SVN.I want to install it in my organisation.
> We already have CCnet,Bugtracker.net installed with VSS2005.
> Now we want to replace VSS with SVN.
> Environment is:
> OS is Windows 32 bit.
> Visual studio used are VS 2008,2005,2003 and also vb6.0
> 
> But i am confused as i don't know which version to download of SVN that is
> compatible with tortoise svn and also with Ankh SVN.
> Please Advice which versions should i download and from where.

You should install svn 1.6.11 the most recent version on your server. The svn 
server can be accessed by and client that is version 1.x... of course you 
should use the most recent 1.6 client also.

You really should read the svn book, especially the section on server 
configuration:

http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.serverconfig

..of course you should read the whole book or at least the parts that apply to 
you.

As far as what to d/l it depends on what server OS you are using. This page 
should lead you to find the binaries you need: 
http://subversion.apache.org/packages.html

Or of course you could go with compiling the code yourself... although we've 
been using svn for over 3 years and I have never compiled from source. I always 
use the collabnet binaries for windows.

BOb

RE: Win7 Integartion issue

[Bob Archer]

> > On 4/27/2010 12:09 PM, Bharti, Brijender wrote:
> >>
> >> Hi,
> >>
> >> I was using SVN on WinXP and migrated to Win7 64bit. I downloaded SVN
> >> 64bit (earlier was 32bit) 1.6.11. It gets installed but it does not get
> >> integrated with Windows Explorer. I can not see Tortoise SVN also in
> >> Program Menu. I can see it is installed in control panel and Program
> Folder.
> >
> > It sounds like you downloaded SVN, not TortoiseSVN, since there is no
> TortoiseSVN 1.6.11 yet. The latest version of TortoiseSVN is 1.6.8.
> 
> I am experiencing a similar issue, using TortoiseSVN 1.6.7 on Windows 7
> 32-bit.
> TortoiseSVN appears in the Programs menu in my case,
> but it is absent from the context menu in the explorer.
> More interesting, when I checkout directories using the command line
> client,

Make sure you install the correct version of TortoiseSVN. If you are on a 
64-bit machine then Explorer runs as a 64-bit app so you need to install the 
64-bit version of TSVN.

> I can browse the checked out working copy in the explorer and see the
> icon overlays of Tortoise, and also while in the working copy the
> context menu items are mysteriously present.

Are you sure you are looking at a working copy. Does it have .svn folders in 
it. Also, check the settings for overlays and make sure you aren't exluding any 
paths. 

Oh, you should move this discussion to the TSVN list.

BOb

Re: Compiling Subversion on AIX

[Robert Cooper]

Thanks for the help Giulio.  Using that configure statement (with gcc):
CC="gcc" LDFLAGS="-L/usr/local/lib" ./configure -C --disable-shared
--without-ssl \
 --without-berkeley-db
--prefix=/usr/local/svn--with-apr=/usr/local/apr
--with-apr-util=/usr/local/apr-util \
--without-apxs --without-serf --disable-nls

 helped me get to the make install but now I'm getting the following error:
/usr/svn/subversion-1.6.11/build/install-sh -c -m 644
./subversion/svnsync/svnsync.1 /usr/local/svn/share/man/man1/svnsync.1
/usr/svn/subversion-1.6.11/build/install-sh -c -m 644
./subversion/svnversion/svnversion.1
/usr/local/svn/share/man/man1/svnver
sion.1
    subversion/svnversion/svnversion . /repos/svn/trunk >
/usr/local/svn/include/subversion-1/svn-revision.txt
Could not load program
/usr/svn/subversion-1.6.11/subversion/svnversion/.libs/lt-svnversion:
Could not load module
/usr/svn/subversion-1.6.11/subversion/libsvn_subr/.libs/libsvn_subr-1.so.
    Dependent module
/usr/local/apr-util/lib/libexpat.a(libexpat.so.1) could not be loaded.
    Member libexpat.so.1 is not found in archive
Could not load module lt-svnversion.
    Dependent module
/usr/svn/subversion-1.6.11/subversion/libsvn_subr/.libs/libsvn_subr-1.so
could not be loaded.
Could not load module .
make: The error code from the last command is 255.
Stop.


Any ideas on what might be stopping the install?  expat?

Thanks,
Robert

view history link does not work

[Ganterer Markus]

hello users!
 
i do not know if this post is ok in this way, but i try it:
 
i have installed apache subersion on a linx system and all works fine,
only the view history link does not work

 
i made a lot of tests an noticed that in the upper side of tha page e.g.
e see only "/", but i my eyes i should see e.g. /foldername/...
 
and the if i click on "view history"  there comes up an error, but i
think that the url behind the "view history" link is wrong.
if i check the url, under target i see e.g. only the last folder folder
and not the whole link.
 
e.g. target=//XNO_Aquaboost/ is only part of the folder, the beginning
is missing.
 
http://svnnat/repos-web/open/log/?base=&target=//XNO_Aquaboost/
 
 
 
and then comey up this error:
 
Repository history
svn: PROPFIND request failed on '/svn/XNO_Aquaboost'
svn: PROPFIND of '/svn/XNO_Aquaboost': authorization failed
(http://svnnat  )
 
 
is this the right folder to post? and the right way?
any help is appreciatedt
 
br
 
--
Markus Ganterer, IT
Tel. +39 0473 671937, fax +39 0473 671909
Vacon s.r.l., Via Zona Industriale 11, 39025 Naturno(BZ), Italy
Driven by Drives, www.vacon.it
 

Re: Common name for transaction and revision object

[Geoff Rowell]

On Wed, Apr 28, 2010 at 10:01 AM, Cooke, Mark  wrote:
>> > From: Geoff Rowell [mailto:geoff.row...@gmail.com]
>> > Sent: 22 April 2010 14:21
>> > To: Giulio Troccoli
>> > Cc: users@subversion.apache.org
>> > Subject: RE: Common name for transaction and revision object
>> >
>> > Giulio Troccoli  wrote:
>> > >
>> > > I'm writing the hooks for a new repository in Perl and I'm
>> > exploring
>> > > using
>> > OO Perl. In both pre- and post-commit hooks I need the list
>> > of files, the author and other similar information. My idea
>> > was to define a class and create an instance of that class
>> > given either the transaction number adn repository path or
>> > the revision number and the repository URL. The 'new'
>> > function will then initialise all the information I need
>> > calling either svnlook or svn. For instance:
>> > >
>> > > my $transaction = new Transaction($txn, $repo_path);
>> > >
>> > > Or
>> > >
>> > > my $commit = new Commit($rev, $repo_url);
>> > >
>> > > As you can see they are almost the same, so it would be
>> > nice to have a
>> > single class (I could then check the second parameter to see
>> > if it's a URL or a path and do things accordingly). But I
>> > cannot come up with a single name that would encompass both,
>> > and that's what I'm asking the list.
>> > >
>> > > So, any suggestions?
>> >
>>
>> Sorry, for posting again but I haven't received any
>> suggestions regarding the name. Nobody can come up with
>> anything? Really?
>>
> What about "Transaction" or "BaseTransaction" or "TransactionBase"?  A
> commit is just a specific transaction anyway.
>
> What does the other poster use in the framework he pointed you to?
>
SvnHook uses Context::Transaction (as opposed to Context::Revision and
Context::Standard).
--
Geoff Rowell
geoff.row...@gmail.com

RE: Compiling Subversion on AIX

[Giulio Troccoli]

>


Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851VAT Reg No 778499447

-Original Message-


> From: dig1tal.coo...@gmail.com
> [mailto:dig1tal.coo...@gmail.com] On Behalf Of Robert Cooper
> Sent: 28 April 2010 15:23
> To: Giulio Troccoli; users@subversion.apache.org
> Subject: Re: Compiling Subversion on AIX
>
> Thanks for the help Giulio.  Using that configure statement
> (with gcc):
> CC="gcc" LDFLAGS="-L/usr/local/lib" ./configure -C
> --disable-shared --without-ssl \
>  --without-berkeley-db
> --prefix=/usr/local/svn--with-apr=/usr/local/apr
> --with-apr-util=/usr/local/apr-util \
> --without-apxs --without-serf --disable-nls
>
>  helped me get to the make install but now I'm getting the
> following error:
> /usr/svn/subversion-1.6.11/build/install-sh -c -m 644
> ./subversion/svnsync/svnsync.1 /usr/local/svn/share/man/man1/svnsync.1
> /usr/svn/subversion-1.6.11/build/install-sh -c -m 644
> ./subversion/svnversion/svnversion.1
> /usr/local/svn/share/man/man1/svnver
> sion.1
> subversion/svnversion/svnversion . /repos/svn/trunk >
> /usr/local/svn/include/subversion-1/svn-revision.txt
> Could not load program
> /usr/svn/subversion-1.6.11/subversion/svnversion/.libs/lt-svnversion:
> Could not load module
> /usr/svn/subversion-1.6.11/subversion/libsvn_subr/.libs/libsvn
> _subr-1.so.
> Dependent module
> /usr/local/apr-util/lib/libexpat.a(libexpat.so.1) could not be loaded.
> Member libexpat.so.1 is not found in archive Could
> not load module lt-svnversion.
> Dependent module
> /usr/svn/subversion-1.6.11/subversion/libsvn_subr/.libs/libsvn
> _subr-1.so
> could not be loaded.
> Could not load module .
> make: The error code from the last command is 255.
> Stop.
>
>
> Any ideas on what might be stopping the install?  expat?

Did you use my exact configure? Because that was just the last part of a 
process where I built other things manually, e.g. expat that in your case make 
can't find.

I was only suggesting to use CC, CFLAGS, etc. to specify another compiler and 
options.

G

Re: Win7 Integartion issue

[Itamar O]

On Wed, Apr 28, 2010 at 5:10 PM, Bob Archer  wrote:
>
> > > On 4/27/2010 12:09 PM, Bharti, Brijender wrote:
> > >>
> > >> Hi,
> > >>
> > >> I was using SVN on WinXP and migrated to Win7 64bit. I downloaded SVN
> > >> 64bit (earlier was 32bit) 1.6.11. It gets installed but it does not get
> > >> integrated with Windows Explorer. I can not see Tortoise SVN also in
> > >> Program Menu. I can see it is installed in control panel and Program
> > Folder.
> > >
> > > It sounds like you downloaded SVN, not TortoiseSVN, since there is no
> > TortoiseSVN 1.6.11 yet. The latest version of TortoiseSVN is 1.6.8.
> >
> > I am experiencing a similar issue, using TortoiseSVN 1.6.7 on Windows 7
> > 32-bit.
> > TortoiseSVN appears in the Programs menu in my case,
> > but it is absent from the context menu in the explorer.
> > More interesting, when I checkout directories using the command line
> > client,
>
> Make sure you install the correct version of TortoiseSVN. If you are on a 
> 64-bit machine then Explorer runs as a 64-bit app so you need to install the 
> 64-bit version of TSVN.
>
> > I can browse the checked out working copy in the explorer and see the
> > icon overlays of Tortoise, and also while in the working copy the
> > context menu items are mysteriously present.
>
> Are you sure you are looking at a working copy. Does it have .svn folders in 
> it. Also, check the settings for overlays and make sure you aren't exluding 
> any paths.
>
> Oh, you should move this discussion to the TSVN list.
>
> BOb
>

Turns out the discussion already occurred on the TSVN list [1].
My issue was in directories that were under libraries.
TSVN 1.6.8 solved the issue for me.

[1] 
http://groups.google.com/group/tortoisesvn/browse_thread/thread/d0f3dd039e43c3b8/93ddd203cda1de36

Re: Common name for transaction and revision object

[Blair Zajac]

On 4/28/10 6:46 AM, Giulio Troccoli wrote:





Linedata Services (UK) Ltd
Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB
Registered in England and Wales No 3027851VAT Reg No 778499447

-Original Message-



From: Geoff Rowell [mailto:geoff.row...@gmail.com]
Sent: 22 April 2010 14:21
To: Giulio Troccoli
Cc: users@subversion.apache.org
Subject: RE: Common name for transaction and revision object

Giulio Troccoli  wrote:


I'm writing the hooks for a new repository in Perl and I'm

exploring

using

OO Perl. In both pre- and post-commit hooks I need the list
of files, the author and other similar information. My idea
was to define a class and create an instance of that class
given either the transaction number adn repository path or
the revision number and the repository URL. The 'new'
function will then initialise all the information I need
calling either svnlook or svn. For instance:



As you can see they are almost the same, so it would be

nice to have a
single class (I could then check the second parameter to see
if it's a URL or a path and do things accordingly). But I
cannot come up with a single name that would encompass both,
and that's what I'm asking the list.


So, any suggestions?




Sorry, for posting again but I haven't received any suggestions regarding the 
name. Nobody can come up with anything? Really?


If you look at the svn_fs.h API, they are both referred to as revision roots. 
svn_fs_revision_root() and svn_fs_txn_root() both return a svn_fs_root_t * object.


Blair

Re: Rearranging archive

[Steve Kelley]

I've tried that with every combination of file://... I can think of and 
I keep getting errors. the disk layout is:

drive D (Windows XP)
d:\archive - normal directory
under archive there are multiple repositories, each representing a 
separate project.

I've created a new repository
svnadmin create d:\MyArchive
I created a directory tree to mirror what I want:
d:\temp
d:\temp\proj1
d:\temp\proj1\trunk
d:\temp\proj1\branches
d:\temp\proj1\tags
d:\temp\proj2
d:\temp\proj2\trunk
d:\temp\proj2\branches
d:\temp\proj2\tags
...
From d:\temp I ran
svn import . file:///MyArchive
svn list file:///MyArchive shows the project files

Now, how do I get d:\archive\proj1 into d:\MyArchive\proj1\trunk?
Here is what I am getting

D:\archive>svn mv file:///archive/proj1 file:///MyArchive/proj1/trunk
svn: Source and dest appear not to be in the same repository (src: 
'file:///archive/crbuild'; dst: 'file:///MyArchive/crbuild/trunk')


Bob Archer wrote:

Thanks for the response. This I can do. However, what I want is to get
all of the history etc. into the trunk so that it looks like the
repository was created properly to start with. The svn mkdir and mv
commands do not work in the repository itself, only in the working copy.



Sure they do... check out svn help mv:

  SRC and DST can both be working copy (WC) paths or URLs:
WC  -> WC:   move and schedule for addition (with history)
URL -> URL:  complete server-side rename.
  All the SRCs must be of the same type.


The mv will retain all the history. 


If you are on windows you can use the TortoiseSVN repo browser. It makes stuff 
like this very easy.

BOb



No virus found in this incoming message.
Checked by AVG - www.avg.com 
Version: 9.0.814 / Virus Database: 271.1.1/2839 - Release Date: 04/27/10 14:27:00


  


--
Steve Kelley
106 Oklahoma Ave.
Oak Ridge, TN 37830
865 482 7131

Re: Rearranging archive

[Itamar O]

On Wed, Apr 28, 2010 at 6:06 PM, Steve Kelley  wrote:
> I've tried that with every combination of file://... I can think of and I
> keep getting errors. the disk layout is:
> drive D (Windows XP)
> d:\archive - normal directory
> under archive there are multiple repositories, each representing a separate
> project.
> I've created a new repository
> svnadmin create d:\MyArchive
> I created a directory tree to mirror what I want:
> d:\temp
> d:\temp\proj1
> d:\temp\proj1\trunk
> d:\temp\proj1\branches
> d:\temp\proj1\tags
> d:\temp\proj2
> d:\temp\proj2\trunk
> d:\temp\proj2\branches
> d:\temp\proj2\tags
> ...
> From d:\temp I ran
> svn import . file:///MyArchive
> svn list file:///MyArchive shows the project files
>
> Now, how do I get d:\archive\proj1 into d:\MyArchive\proj1\trunk?
> Here is what I am getting
>
> D:\archive>svn mv file:///archive/proj1 file:///MyArchive/proj1/trunk
> svn: Source and dest appear not to be in the same repository (src:
> 'file:///archive/crbuild'; dst: 'file:///MyArchive/crbuild/trunk')

This is a repository command, not WC command, as file://* are URLs,
not WC paths.
If "D:\MyArchive" is your repository directory, then try something like:
svn mv file:///D:/MyArchive/proj1 file:///D:/MyArchive/trunk -m ".."
svn mkdir file:///D:/MyArchive/proj1 -m ".."
svn mv file:///D:/MyArchive/trunk file:///D:/MyArchive/proj1/trunk
For this you don't need a working copy at all.

>
> Bob Archer wrote:
>>>
>>> Thanks for the response. This I can do. However, what I want is to get
>>> all of the history etc. into the trunk so that it looks like the
>>> repository was created properly to start with. The svn mkdir and mv
>>> commands do not work in the repository itself, only in the working copy.
>>>
>>
>> Sure they do... check out svn help mv:
>>
>>  SRC and DST can both be working copy (WC) paths or URLs:
>>    WC  -> WC:   move and schedule for addition (with history)
>>    URL -> URL:  complete server-side rename.
>>  All the SRCs must be of the same type.
>>
>>
>> The mv will retain all the history.
>> If you are on windows you can use the TortoiseSVN repo browser. It makes
>> stuff like this very easy.
>>
>> BOb
>> 
>>
>>
>> No virus found in this incoming message.
>> Checked by AVG - www.avg.com Version: 9.0.814 / Virus Database:
>> 271.1.1/2839 - Release Date: 04/27/10 14:27:00
>>
>>
>
> --
> Steve Kelley
> 106 Oklahoma Ave.
> Oak Ridge, TN 37830
> 865 482 7131
>
>

RE: Rearranging archive

[Bob Archer]

> Bob Archer wrote:
> >> Thanks for the response. This I can do. However, what I want is to get
> >> all of the history etc. into the trunk so that it looks like the
> >> repository was created properly to start with. The svn mkdir and mv
> >> commands do not work in the repository itself, only in the working
> copy.
> >>
> >
> > Sure they do... check out svn help mv:
> >
> >   SRC and DST can both be working copy (WC) paths or URLs:
> > WC  -> WC:   move and schedule for addition (with history)
> > URL -> URL:  complete server-side rename.
> >   All the SRCs must be of the same type.
> >
> >
> > The mv will retain all the history.
> >
> > If you are on windows you can use the TortoiseSVN repo browser. It makes
> stuff like this very easy.
> >
> > BOb
> > 
> >
> >
> > No virus found in this incoming message.
> > Checked by AVG - www.avg.com
> > Version: 9.0.814 / Virus Database: 271.1.1/2839 - Release Date: 04/27/10
> 14:27:00
> >
> I've tried that with every combination of file://... I can think of and
> I keep getting errors. the disk layout is:
> drive D (Windows XP)
> d:\archive - normal directory
> under archive there are multiple repositories, each representing a
> separate project.
> I've created a new repository
> svnadmin create d:\MyArchive
> I created a directory tree to mirror what I want:
> d:\temp
> d:\temp\proj1
> d:\temp\proj1\trunk
> d:\temp\proj1\branches
> d:\temp\proj1\tags
> d:\temp\proj2
> d:\temp\proj2\trunk
> d:\temp\proj2\branches
> d:\temp\proj2\tags
> ...
>  From d:\temp I ran
> svn import . file:///MyArchive
> svn list file:///MyArchive shows the project files
> 
> Now, how do I get d:\archive\proj1 into d:\MyArchive\proj1\trunk?
> Here is what I am getting
> 
> D:\archive>svn mv file:///archive/proj1 file:///MyArchive/proj1/trunk
> svn: Source and dest appear not to be in the same repository (src:
> 'file:///archive/crbuild'; dst: 'file:///MyArchive/crbuild/trunk')
>

Ok, you can't svn mv from one repo to another. Why do you want another repo? 
Just move within the same repo:

D:\archive>svn mv file:///archive/proj1/* file:///archive/proj1/trunk

BOb

RE: Rearranging archive

[Bob Archer]

> > Bob Archer wrote:
> > >> Thanks for the response. This I can do. However, what I want is to
> get
> > >> all of the history etc. into the trunk so that it looks like the
> > >> repository was created properly to start with. The svn mkdir and mv
> > >> commands do not work in the repository itself, only in the working
> > copy.
> > >>
> > >
> > > Sure they do... check out svn help mv:
> > >
> > >   SRC and DST can both be working copy (WC) paths or URLs:
> > > WC  -> WC:   move and schedule for addition (with history)
> > > URL -> URL:  complete server-side rename.
> > >   All the SRCs must be of the same type.
> > >
> > >
> > > The mv will retain all the history.
> > >
> > > If you are on windows you can use the TortoiseSVN repo browser. It
> makes
> > stuff like this very easy.
> > >
> > > BOb
> > > --
> --
> > >
> > >
> > > No virus found in this incoming message.
> > > Checked by AVG - www.avg.com
> > > Version: 9.0.814 / Virus Database: 271.1.1/2839 - Release Date:
> 04/27/10
> > 14:27:00
> > >
> > I've tried that with every combination of file://... I can think of and
> > I keep getting errors. the disk layout is:
> > drive D (Windows XP)
> > d:\archive - normal directory
> > under archive there are multiple repositories, each representing a
> > separate project.
> > I've created a new repository
> > svnadmin create d:\MyArchive
> > I created a directory tree to mirror what I want:
> > d:\temp
> > d:\temp\proj1
> > d:\temp\proj1\trunk
> > d:\temp\proj1\branches
> > d:\temp\proj1\tags
> > d:\temp\proj2
> > d:\temp\proj2\trunk
> > d:\temp\proj2\branches
> > d:\temp\proj2\tags
> > ...
> >  From d:\temp I ran
> > svn import . file:///MyArchive
> > svn list file:///MyArchive shows the project files
> >
> > Now, how do I get d:\archive\proj1 into d:\MyArchive\proj1\trunk?
> > Here is what I am getting
> >
> > D:\archive>svn mv file:///archive/proj1 file:///MyArchive/proj1/trunk
> > svn: Source and dest appear not to be in the same repository (src:
> > 'file:///archive/crbuild'; dst: 'file:///MyArchive/crbuild/trunk')
> >
> 
> Ok, you can't svn mv from one repo to another. Why do you want another
> repo? Just move within the same repo:
> 
> D:\archive>svn mv file:///archive/proj1/* file:///archive/proj1/trunk
> 

Also, I think you need to specify the drive letter to. I don't use the file: 
protocol so not 100% sure... something like:

D:\archive>svn mv file:///d:\archive/proj1/* file:///d:\archive/proj1/trunk

BOb

Re: Rearranging archive

[Steve Kelley]

Still no go.

D:\archive>svn mkdir file:///d:/archive/crbuild/trunk -m"Create trunk 
directory"


Committed revision 45.

D:\archive>svn mv file:///d:/archive/crbuild/* 
file:///d:/archive/crbuild/trunk

svn: Path 'file:///d:/archive/crbuild/*' does not exist in revision 45


Bob Archer wrote:

Bob Archer wrote:


Thanks for the response. This I can do. However, what I want is to get
all of the history etc. into the trunk so that it looks like the
repository was created properly to start with. The svn mkdir and mv
commands do not work in the repository itself, only in the working


copy.


Sure they do... check out svn help mv:

  SRC and DST can both be working copy (WC) paths or URLs:
WC  -> WC:   move and schedule for addition (with history)
URL -> URL:  complete server-side rename.
  All the SRCs must be of the same type.


The mv will retain all the history.

If you are on windows you can use the TortoiseSVN repo browser. It makes
  

stuff like this very easy.


BOb



No virus found in this incoming message.
Checked by AVG - www.avg.com
Version: 9.0.814 / Virus Database: 271.1.1/2839 - Release Date: 04/27/10
  

14:27:00

I've tried that with every combination of file://... I can think of and

I keep getting errors. the disk layout is:
drive D (Windows XP)
d:\archive - normal directory
under archive there are multiple repositories, each representing a
separate project.
I've created a new repository
svnadmin create d:\MyArchive
I created a directory tree to mirror what I want:
d:\temp
d:\temp\proj1
d:\temp\proj1\trunk
d:\temp\proj1\branches
d:\temp\proj1\tags
d:\temp\proj2
d:\temp\proj2\trunk
d:\temp\proj2\branches
d:\temp\proj2\tags
...
 From d:\temp I ran
svn import . file:///MyArchive
svn list file:///MyArchive shows the project files

Now, how do I get d:\archive\proj1 into d:\MyArchive\proj1\trunk?
Here is what I am getting

D:\archive>svn mv file:///archive/proj1 file:///MyArchive/proj1/trunk
svn: Source and dest appear not to be in the same repository (src:
'file:///archive/crbuild'; dst: 'file:///MyArchive/crbuild/trunk')




Ok, you can't svn mv from one repo to another. Why do you want another repo? 
Just move within the same repo:

D:\archive>svn mv file:///archive/proj1/* file:///archive/proj1/trunk

BOb

  




No virus found in this incoming message.
Checked by AVG - www.avg.com 
Version: 9.0.814 / Virus Database: 271.1.1/2840 - Release Date: 04/28/10 02:27:00


  


--
Steve Kelley
106 Oklahoma Ave.
Oak Ridge, TN 37830
865 482 7131

RE: Rearranging archive

[Bob Archer]

Since you're on windows I really suggest installing tortoiseSVN... open your 
repository with the repo browser and you can drag and drop folder/files around 
in your repo just like you can your file system in Explorer.

BOb


> -Original Message-
> From: Steve Kelley [mailto:skel...@sciend.com]
> Sent: Wednesday, April 28, 2010 12:05 PM
> To: Bob Archer
> Cc: Ryan Schmidt; users@subversion.apache.org
> Subject: Re: Rearranging archive
> 
> Still no go.
> 
> D:\archive>svn mkdir file:///d:/archive/crbuild/trunk -m"Create trunk
> directory"
> 
> Committed revision 45.
> 
> D:\archive>svn mv file:///d:/archive/crbuild/*
> file:///d:/archive/crbuild/trunk
> svn: Path 'file:///d:/archive/crbuild/*' does not exist in revision 45
> 
> 
> Bob Archer wrote:
> >> Bob Archer wrote:
> >>
>  Thanks for the response. This I can do. However, what I want is to
> get
>  all of the history etc. into the trunk so that it looks like the
>  repository was created properly to start with. The svn mkdir and mv
>  commands do not work in the repository itself, only in the working
> 
> >> copy.
> >>
> >>> Sure they do... check out svn help mv:
> >>>
> >>>   SRC and DST can both be working copy (WC) paths or URLs:
> >>> WC  -> WC:   move and schedule for addition (with history)
> >>> URL -> URL:  complete server-side rename.
> >>>   All the SRCs must be of the same type.
> >>>
> >>>
> >>> The mv will retain all the history.
> >>>
> >>> If you are on windows you can use the TortoiseSVN repo browser. It
> makes
> >>>
> >> stuff like this very easy.
> >>
> >>> BOb
> >>> --
> --
> >>>
> >>>
> >>> No virus found in this incoming message.
> >>> Checked by AVG - www.avg.com
> >>> Version: 9.0.814 / Virus Database: 271.1.1/2839 - Release Date:
> 04/27/10
> >>>
> >> 14:27:00
> >>
> >> I've tried that with every combination of file://... I can think of and
> >> I keep getting errors. the disk layout is:
> >> drive D (Windows XP)
> >> d:\archive - normal directory
> >> under archive there are multiple repositories, each representing a
> >> separate project.
> >> I've created a new repository
> >> svnadmin create d:\MyArchive
> >> I created a directory tree to mirror what I want:
> >> d:\temp
> >> d:\temp\proj1
> >> d:\temp\proj1\trunk
> >> d:\temp\proj1\branches
> >> d:\temp\proj1\tags
> >> d:\temp\proj2
> >> d:\temp\proj2\trunk
> >> d:\temp\proj2\branches
> >> d:\temp\proj2\tags
> >> ...
> >>  From d:\temp I ran
> >> svn import . file:///MyArchive
> >> svn list file:///MyArchive shows the project files
> >>
> >> Now, how do I get d:\archive\proj1 into d:\MyArchive\proj1\trunk?
> >> Here is what I am getting
> >>
> >> D:\archive>svn mv file:///archive/proj1 file:///MyArchive/proj1/trunk
> >> svn: Source and dest appear not to be in the same repository (src:
> >> 'file:///archive/crbuild'; dst: 'file:///MyArchive/crbuild/trunk')
> >>
> >>
> >
> > Ok, you can't svn mv from one repo to another. Why do you want another
> repo? Just move within the same repo:
> >
> > D:\archive>svn mv file:///archive/proj1/* file:///archive/proj1/trunk
> >
> > BOb
> >
> >
> > 
> >
> >
> > No virus found in this incoming message.
> > Checked by AVG - www.avg.com
> > Version: 9.0.814 / Virus Database: 271.1.1/2840 - Release Date: 04/28/10
> 02:27:00
> >
> >
> 
> --
> Steve Kelley
> 106 Oklahoma Ave.
> Oak Ridge, TN 37830
> 865 482 7131

Re: Rearranging archive

[Steve Kelley]

I have had trouble in the past using Tortoise on the server then 
accessing the repository over the internet. There seems to be a lot of 
dependency on versions. I currently am using 1.4.4 with Apache 2.2.4. 
When the person who initially loaded the archive did it he was using 
Tortoise with a network mounted drive and we found that the file format 
value (in the format file) was not compatible with the server setup. 
Currently, format contains a 5. Can I use the latest Tortoise or do I 
need to load an older one?


BTW, thanks for your patience. This is my first attempt at setting up 
and administering subversion and I realize some (if not all) questions 
are basic. I have looked over the documentation but because the 
repository was not set up according to the recommended structure, things 
don't seem to work as they I expect.


Bob Archer wrote:

Since you're on windows I really suggest installing tortoiseSVN... open your 
repository with the repo browser and you can drag and drop folder/files around 
in your repo just like you can your file system in Explorer.

BOb


  

-Original Message-
From: Steve Kelley [mailto:skel...@sciend.com]
Sent: Wednesday, April 28, 2010 12:05 PM
To: Bob Archer
Cc: Ryan Schmidt; users@subversion.apache.org
Subject: Re: Rearranging archive

Still no go.

D:\archive>svn mkdir file:///d:/archive/crbuild/trunk -m"Create trunk
directory"

Committed revision 45.

D:\archive>svn mv file:///d:/archive/crbuild/*
file:///d:/archive/crbuild/trunk
svn: Path 'file:///d:/archive/crbuild/*' does not exist in revision 45


Bob Archer wrote:


Bob Archer wrote:



Thanks for the response. This I can do. However, what I want is to


get


all of the history etc. into the trunk so that it looks like the
repository was created properly to start with. The svn mkdir and mv
commands do not work in the repository itself, only in the working



copy.



Sure they do... check out svn help mv:

  SRC and DST can both be working copy (WC) paths or URLs:
WC  -> WC:   move and schedule for addition (with history)
URL -> URL:  complete server-side rename.
  All the SRCs must be of the same type.


The mv will retain all the history.

If you are on windows you can use the TortoiseSVN repo browser. It
  

makes


stuff like this very easy.



BOb
--
  

--


No virus found in this incoming message.
Checked by AVG - www.avg.com
Version: 9.0.814 / Virus Database: 271.1.1/2839 - Release Date:
  

04/27/10


14:27:00

I've tried that with every combination of file://... I can think of and
I keep getting errors. the disk layout is:
drive D (Windows XP)
d:\archive - normal directory
under archive there are multiple repositories, each representing a
separate project.
I've created a new repository
svnadmin create d:\MyArchive
I created a directory tree to mirror what I want:
d:\temp
d:\temp\proj1
d:\temp\proj1\trunk
d:\temp\proj1\branches
d:\temp\proj1\tags
d:\temp\proj2
d:\temp\proj2\trunk
d:\temp\proj2\branches
d:\temp\proj2\tags
...
 From d:\temp I ran
svn import . file:///MyArchive
svn list file:///MyArchive shows the project files

Now, how do I get d:\archive\proj1 into d:\MyArchive\proj1\trunk?
Here is what I am getting

D:\archive>svn mv file:///archive/proj1 file:///MyArchive/proj1/trunk
svn: Source and dest appear not to be in the same repository (src:
'file:///archive/crbuild'; dst: 'file:///MyArchive/crbuild/trunk')




Ok, you can't svn mv from one repo to another. Why do you want another
  

repo? Just move within the same repo:


D:\archive>svn mv file:///archive/proj1/* file:///archive/proj1/trunk

BOb





No virus found in this incoming message.
Checked by AVG - www.avg.com
Version: 9.0.814 / Virus Database: 271.1.1/2840 - Release Date: 04/28/10
  

02:27:00

  

--
Steve Kelley
106 Oklahoma Ave.
Oak Ridge, TN 37830
865 482 7131





No virus found in this incoming message.
Checked by AVG - www.avg.com 
Version: 9.0.814 / Virus Database: 271.1.1/2840 - Release Date: 04/28/10 02:27:00





--
Steve Kelley
106 Oklahoma Ave.
Oak Ridge, TN 37830
865 482 7131

RE: Rearranging archive

[Bob Archer]

> I have had trouble in the past using Tortoise on the server then
> accessing the repository over the internet. There seems to be a lot of
> dependency on versions. I currently am using 1.4.4 with Apache 2.2.4.
> When the person who initially loaded the archive did it he was using
> Tortoise with a network mounted drive and we found that the file format
> value (in the format file) was not compatible with the server setup.
> Currently, format contains a 5. Can I use the latest Tortoise or do I
> need to load an older one?
> 
> BTW, thanks for your patience. This is my first attempt at setting up
> and administering subversion and I realize some (if not all) questions
> are basic. I have looked over the documentation but because the
> repository was not set up according to the recommended structure, things
> don't seem to work as they I expect.


Ok, I see the problem... I set up a repo and tested this my self. If you try to 
copy it all to trunk then there is a problem.

I was able to move the folders/files one at a time. Like this:

svn mkdir file:///c:/Users/Development/TestRepository

svn mv file:///c:/Users/Development/TestRepository/folder1 
file:///c:/Users/Development/TestRepository/trunk

repeat for each folder/file in the root of your project.

Here is another way... you will need svnadmin to do it... You well need to 
create a new empty repository...

mkdir TempDump
cd TempDump
svnadmin dump c:/Users/Development/TestRepositry > MyRepo
svnadmin load --parent-dir c:/Users/Development/NewRepository/Trunk < MyRepo

Ah yes, you have to be careful with versions. I really suggest you use 1.6 for 
everything. Also, you really shouldn't be using the file:// protocol on shared 
repositories. 

BOb

RE: Rearranging archive

[Bob Archer]

> -Original Message-
> From: Bob Archer [mailto:bob.arc...@amsi.com]
> Sent: Wednesday, April 28, 2010 12:40 PM
> To: Steve Kelley
> Cc: Ryan Schmidt; users@subversion.apache.org
> Subject: RE: Rearranging archive
> 
> > I have had trouble in the past using Tortoise on the server then
> > accessing the repository over the internet. There seems to be a lot of
> > dependency on versions. I currently am using 1.4.4 with Apache 2.2.4.
> > When the person who initially loaded the archive did it he was using
> > Tortoise with a network mounted drive and we found that the file format
> > value (in the format file) was not compatible with the server setup.
> > Currently, format contains a 5. Can I use the latest Tortoise or do I
> > need to load an older one?
> >
> > BTW, thanks for your patience. This is my first attempt at setting up
> > and administering subversion and I realize some (if not all) questions
> > are basic. I have looked over the documentation but because the
> > repository was not set up according to the recommended structure, things
> > don't seem to work as they I expect.
> 
> 
> Ok, I see the problem... I set up a repo and tested this my self. If you
> try to copy it all to trunk then there is a problem.
> 
> I was able to move the folders/files one at a time. Like this:
> 
> svn mkdir file:///c:/Users/Development/TestRepository

Opps... this should be:

svn mkdir file:///c:/Users/Development/TestRepository/trunk





> svn mv file:///c:/Users/Development/TestRepository/folder1
> file:///c:/Users/Development/TestRepository/trunk
> 
> repeat for each folder/file in the root of your project.
> 
> Here is another way... you will need svnadmin to do it... You well need to
> create a new empty repository...
> 
> mkdir TempDump
> cd TempDump
> svnadmin dump c:/Users/Development/TestRepositry > MyRepo
> svnadmin load --parent-dir c:/Users/Development/NewRepository/Trunk <
> MyRepo
> 
> Ah yes, you have to be careful with versions. I really suggest you use 1.6
> for everything. Also, you really shouldn't be using the file:// protocol
> on shared repositories.
> 
> BOb

Re: Rearranging archive

[Steve Kelley]

I'm using file:// 'cause all of the setup instructions I found for using 
svn over SSH that I saw do it that way. Our setup is a 'file server' 
which I access over the internet using SSH while the others who use it 
are on the server's local network. Everything is locked down pretty 
tight, there is no http access, only https. What do you suggest?


Bob Archer wrote:

I have had trouble in the past using Tortoise on the server then
accessing the repository over the internet. There seems to be a lot of
dependency on versions. I currently am using 1.4.4 with Apache 2.2.4.
When the person who initially loaded the archive did it he was using
Tortoise with a network mounted drive and we found that the file format
value (in the format file) was not compatible with the server setup.
Currently, format contains a 5. Can I use the latest Tortoise or do I
need to load an older one?

BTW, thanks for your patience. This is my first attempt at setting up
and administering subversion and I realize some (if not all) questions
are basic. I have looked over the documentation but because the
repository was not set up according to the recommended structure, things
don't seem to work as they I expect.




Ok, I see the problem... I set up a repo and tested this my self. If you try to 
copy it all to trunk then there is a problem.

I was able to move the folders/files one at a time. Like this:

svn mkdir file:///c:/Users/Development/TestRepository

svn mv file:///c:/Users/Development/TestRepository/folder1 
file:///c:/Users/Development/TestRepository/trunk

repeat for each folder/file in the root of your project.

Here is another way... you will need svnadmin to do it... You well need to 
create a new empty repository...

mkdir TempDump
cd TempDump
svnadmin dump c:/Users/Development/TestRepositry > MyRepo
svnadmin load --parent-dir c:/Users/Development/NewRepository/Trunk < MyRepo

Ah yes, you have to be careful with versions. I really suggest you use 1.6 for everything. Also, you really shouldn't be using the file:// protocol on shared repositories. 


BOb
  




No virus found in this incoming message.
Checked by AVG - www.avg.com 
Version: 9.0.814 / Virus Database: 271.1.1/2840 - Release Date: 04/28/10 02:27:00


  


--
Steve Kelley
106 Oklahoma Ave.
Oak Ridge, TN 37830
865 482 7131

tracking merges

[Jeremy Mordkoff]

I know how to find what has been merged into any branch, but is there a
tool to track where changes have been merged to? 

Here's my problem. I was working on a customer release based on rev 5 of
our product. Now they have decided to use rev 4 instead. So I need to
merge a bunch of changes from the rev 5 branch to the rev 4
branch...actually a new branch based on rev 4. But only their
customizations.

What I would really like is an option to svn log that would tell me
every branch to which each change had been merged, but I'm thinking I'll
have to run reports against the potential merge destinations first and
then post process the svn log output. Anyone already tackled this? 

I wish I had just done their customizations in a branch.

Thanks
JLM

Jeremy Mordkoff
Director, QA, IT & Release
ZeeVee, Inc.
One Monarch Drive | Littleton, MA 01460
Office: 978.467.1395 x233 | Fax: 978.467.1404
Mobile: 978-257-2183
j...@zeevee.com 
www.zeevee.com 

Re: Rearranging archive

[Les Mikesell]

On 4/28/2010 11:21 AM, Steve Kelley wrote:

I have had trouble in the past using Tortoise on the server then
accessing the repository over the internet. There seems to be a lot of
dependency on versions. I currently am using 1.4.4 with Apache 2.2.4.
When the person who initially loaded the archive did it he was using
Tortoise with a network mounted drive and we found that the file format
value (in the format file) was not compatible with the server setup.
Currently, format contains a 5. Can I use the latest Tortoise or do I
need to load an older one?


You should not have a problem between different client/server versions. 
 However, different clients accessing the same working copy all have to 
be the same version number (like command line and tortoise) because the 
newest one will adjust the format so the older clients can't work.



BTW, thanks for your patience. This is my first attempt at setting up
and administering subversion and I realize some (if not all) questions
are basic. I have looked over the documentation but because the
repository was not set up according to the recommended structure, things
don't seem to work as they I expect.


If you are just getting started, I'd recommend using something much more 
current than a 1.4.x on the server side.


--
  Les Mikesell
   lesmikes...@gmail.com

Re: Rearranging archive

[Les Mikesell]

On 4/28/2010 11:49 AM, Steve Kelley wrote:

I'm using file:// 'cause all of the setup instructions I found for using
svn over SSH that I saw do it that way. Our setup is a 'file server'
which I access over the internet using SSH while the others who use it
are on the server's local network. Everything is locked down pretty
tight, there is no http access, only https. What do you suggest?


Https is perfect if it is apache with mod_dav_svn.

--
  Les Mikesell
   lesmikes...@gmail.com

RE: Rearranging archive

[Bob Archer]

I think you should be using svn+ssh. 
http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.serverconfig.svnserve.sshauth
 Doing it this way ensures that everyone is using the same version if you set 
up your ssh shell access paths properly. Also, you can upgrade the version on 
the server and everyone will be upgraded since this svn+ssh protocol actually 
runs svnserve on the server from the path you speicify. 

But, that doesn't really matter. Once you have created the repository with the 
version you are using accessing it via the file:// protocol with TSVN will not 
change its format.

In other words, if you have an existing repository that you use TSVN on you 
shouldn't have a problem. If you create a repository with TSVN 1.6.x then try 
to access it with 1.4 clients via file protocol, then yes, you will have 
problems.

BOb
 

> I'm using file:// 'cause all of the setup instructions I found for using
> svn over SSH that I saw do it that way. Our setup is a 'file server'
> which I access over the internet using SSH while the others who use it
> are on the server's local network. Everything is locked down pretty
> tight, there is no http access, only https. What do you suggest?
> 
> Bob Archer wrote:
> >> I have had trouble in the past using Tortoise on the server then
> >> accessing the repository over the internet. There seems to be a lot of
> >> dependency on versions. I currently am using 1.4.4 with Apache 2.2.4.
> >> When the person who initially loaded the archive did it he was using
> >> Tortoise with a network mounted drive and we found that the file format
> >> value (in the format file) was not compatible with the server setup.
> >> Currently, format contains a 5. Can I use the latest Tortoise or do I
> >> need to load an older one?
> >>
> >> BTW, thanks for your patience. This is my first attempt at setting up
> >> and administering subversion and I realize some (if not all) questions
> >> are basic. I have looked over the documentation but because the
> >> repository was not set up according to the recommended structure,
> things
> >> don't seem to work as they I expect.
> >>
> >
> >
> > Ok, I see the problem... I set up a repo and tested this my self. If you
> try to copy it all to trunk then there is a problem.
> >
> > I was able to move the folders/files one at a time. Like this:
> >
> > svn mkdir file:///c:/Users/Development/TestRepository
> >
> > svn mv file:///c:/Users/Development/TestRepository/folder1
> file:///c:/Users/Development/TestRepository/trunk
> >
> > repeat for each folder/file in the root of your project.
> >
> > Here is another way... you will need svnadmin to do it... You well need
> to create a new empty repository...
> >
> > mkdir TempDump
> > cd TempDump
> > svnadmin dump c:/Users/Development/TestRepositry > MyRepo
> > svnadmin load --parent-dir c:/Users/Development/NewRepository/Trunk <
> MyRepo
> >
> > Ah yes, you have to be careful with versions. I really suggest you use
> 1.6 for everything. Also, you really shouldn't be using the file://
> protocol on shared repositories.
> >
> > BOb
> >
> > 
> >
> >
> > No virus found in this incoming message.
> > Checked by AVG - www.avg.com
> > Version: 9.0.814 / Virus Database: 271.1.1/2840 - Release Date: 04/28/10
> 02:27:00
> >
> >
> 
> --
> Steve Kelley
> 106 Oklahoma Ave.
> Oak Ridge, TN 37830
> 865 482 7131

Re: Rearranging archive

[Steve Kelley]

I installed TortoiseSVN taking a chance that I might have to uninstall 
it and fix the archive but it works and my remote machine can check 
out/in files. I guess I should have not been so cautious before. All is 
now well.


Thanks for your help and insights.

Bob Archer wrote:

I have had trouble in the past using Tortoise on the server then
accessing the repository over the internet. There seems to be a lot of
dependency on versions. I currently am using 1.4.4 with Apache 2.2.4.
When the person who initially loaded the archive did it he was using
Tortoise with a network mounted drive and we found that the file format
value (in the format file) was not compatible with the server setup.
Currently, format contains a 5. Can I use the latest Tortoise or do I
need to load an older one?

BTW, thanks for your patience. This is my first attempt at setting up
and administering subversion and I realize some (if not all) questions
are basic. I have looked over the documentation but because the
repository was not set up according to the recommended structure, things
don't seem to work as they I expect.




Ok, I see the problem... I set up a repo and tested this my self. If you try to 
copy it all to trunk then there is a problem.

I was able to move the folders/files one at a time. Like this:

svn mkdir file:///c:/Users/Development/TestRepository

svn mv file:///c:/Users/Development/TestRepository/folder1 
file:///c:/Users/Development/TestRepository/trunk

repeat for each folder/file in the root of your project.

Here is another way... you will need svnadmin to do it... You well need to 
create a new empty repository...

mkdir TempDump
cd TempDump
svnadmin dump c:/Users/Development/TestRepositry > MyRepo
svnadmin load --parent-dir c:/Users/Development/NewRepository/Trunk < MyRepo

Ah yes, you have to be careful with versions. I really suggest you use 1.6 for everything. Also, you really shouldn't be using the file:// protocol on shared repositories. 


BOb
  




No virus found in this incoming message.
Checked by AVG - www.avg.com 
Version: 9.0.814 / Virus Database: 271.1.1/2840 - Release Date: 04/28/10 02:27:00


  


--
Steve Kelley
106 Oklahoma Ave.
Oak Ridge, TN 37830
865 482 7131

Re: Common name for transaction and revision object

[Ryan Schmidt]

On Apr 28, 2010, at 10:03, Blair Zajac wrote:

> If you look at the svn_fs.h API, they are both referred to as revision roots. 
> svn_fs_revision_root() and svn_fs_txn_root() both return a svn_fs_root_t * 
> object.

That does not sound like they're both being referred to as "revision roots"; 
that sounds like they're both being referred to as "roots".

If you're just looking to name a variable, you can call it 
RevisionOrTransaction.

Re: Common name for transaction and revision object

[Blair Zajac]

On 04/28/2010 02:38 PM, Ryan Schmidt wrote:

On Apr 28, 2010, at 10:03, Blair Zajac wrote:


If you look at the svn_fs.h API, they are both referred to as revision roots. 
svn_fs_revision_root() and svn_fs_txn_root() both return a svn_fs_root_t * 
object.


That does not sound like they're both being referred to as "revision roots"; that sounds 
like they're both being referred to as "roots".


Oops, yes, they are filesystem roots.


If you're just looking to name a variable, you can call it 
RevisionOrTransaction.


I've done that in code I've used, or RevisionOrTransactionRoot for my 
use case.


Blair

Tree conflicts on merging into a branch

[Matthias Weyh]

Hello,

I have seen an issue with subversion in which tree conflicts are being
produced when creating a branch from a working copy in which not all
files are at the same revision. This is happening when trying to merge
changes into this branch.

Please refer to the following sequence. Is this supposed to be happening
in this way? I do not exactly understand what causes the tree conflicts.
Shouldn't there at least be a warning on trying to copy from a working
copy with mixed revisions?


>svn co https://localhost/svn/test
Checked out revision 0.

>cd test

test>mkdir trunk

test>mkdir branches

test>mkdir tags

test>svn add trunk branches tags
A trunk
A branches
A tags

test>svn commit -m "initial structure"
Adding branches
Adding tags
Adding trunk

Committed revision 1.

test>svn switch https://localhost/svn/test/trunk
Dtrunk
Dbranches
Dtags
Updated to revision 1.

test>mkdir d1

test>mkdir d2

test>mkdir d3

test>echo loremipsum > d1\f1.txt

test>echo loremipsum > d2\f1.txt

test>echo loremipsum > d3\f1.txt

test>svn add d1 d2 d3
A d1
A d1\f1.txt
A d2
A d2\f1.txt
A d3
A d3\f1.txt

test>svn ci -m "stuff"
Adding d1
Adding d1\f1.txt
Adding d2
Adding d2\f1.txt
Adding d3
Adding d3\f1.txt
Transmitting file data ...
Committed revision 2.

test>svn copy . https://localhost/svn/test/branches/b1 -m "created b1"

Committed revision 3.

test>svn rename d1 d1_r
A d1_r
D d1\f1.txt
D d1

test>svn commit -m "d1 renamed"
Deleting   d1
Adding d1_r

Committed revision 4.

test>svn switch https://localhost/svn/test/branches/b1
Dd1_r
Ad1
Ad1\f1.txt
Updated to revision 4.

test>svn merge https://localhost/svn/test/trunk
--- Merging r2 through r4 into '.':
Ad1_r
Ad1_r\f1.txt
   C d2
   C d3
Summary of conflicts:
  Tree conflicts: 2

D:\repositories\test>svn status -v
 M   43 weyh .
 43 weyh d1
 42 weyh d1\f1.txt
  C  43 weyh d2
  >   local add, incoming add upon merge
 42 weyh d2\f1.txt
A  + -   ?   ?   d1_r
A  + -2 weyh d1_r\f1.txt
  C  43 weyh d3
  >   local add, incoming add upon merge
 42 weyh d3\f1.txt

Best regards,
Matthias