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 suppo
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 be
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
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
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 e
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. Everyt
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
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
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 i
> -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
> >
> 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
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 netw
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.
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:
Bo
> > 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 itse
> 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
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 se
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 creat
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]
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
> > >> int
>
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
>
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 wro
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 sh
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 --d
> > 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
>
> 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
> > 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
> 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.
>
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 Tro
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
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
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 i
I suggest you look at recent posts on the official TortoiseSVN users mailing
list.
us...@tortoisesvn.tigris.org
David
33 matches
Mail list logo