Hi,
I'm having trouble resolving a tree conflict.
I'm working on a feature branch, and I regularly merge from trunk to the
branch. In my latest merge, I got a tree conflict because a directory
("playback") has been added both to trunk and to my branch, with
different contents. I want to get rid
Giulio Troccoli wrote:
>> From: Chris Evans [mailto:chris.ev...@gresearch.co.uk]
>> My repository is made up of a load of folder loaded from
>> cvs2svn dumps.
>> These were loaded individually and have overlapping date ranges.
>> When doing an "svn load" it looks like SVN assigns each
>> commit to
http://subversion.apache.org/faq.html#version-value-in-source
Kind regards,
Jon
-Original Message-
From: BRM [mailto:bm_witn...@yahoo.com]
Sent: 26 October 2010 20:56
To: SubVersion Users
Subject: SVN Keywords...
I have a series of projects that operate as service daemons; all the
proj
Hi,
Robert Johnson wrote:
> I'm not sure this is a bug or the documentation is wrong,
> or I'm misunderstanding the concept.
>
> In the SVN doc:
> > Section 6.5 Path-Based Authorization
> > [paint:/projects/paint]
> > jane = r
> > @paint-developers = rw
> >
> > Another important fact is that the
Hi,
Stephen Connolly wrote:
> I remember reading before about a hack/trick that allows you
> to ensure that the client is at least mergeinfo aware when the
> repository is served via Apache httpd.
You can have a start-commit hook. It can reject commits from clients
that don't have the "mergeinfo
Stefan Sperling wrote:
> On Mon, Sep 06, 2010 at 10:27:46AM -0400, Allen Williams wrote:
> > I send this email out about once a month or so in what is
> > becoming the vain hope I'll get a response...
> >
> > My subversion repository is in /var/svn. Somehow (and, yes, I'm
> > new; I'm evaluating i
Hans wrote:
> I got no reaction on freenode#svn, so here goes :
>
> This looks like a bug in 1.6.12 to me :
> for a subdirectory with its .svn/ removed
> a 'svn up --force .' in its parent does not recreate it
> where 'svn up --force dirname' does
That won't happen in Subversion 1.7, so I wouldn'
Hi,
Steven Woody wrote:
> On 20 August 2010 23:19, Steven Woody wrote:
> > Hi,
> >
> > With a replication/write-through setup, can a user execute 'svn
lock'
> > on master/slaver nodes? Thanks.
>
> Hey folks, no one can gives me a hint?
The SVN Book answers your question.
Kind regards,
Jon
Daniel Shahaf wrote:
> Feldhacker, Chris wrote on Thu, Aug 19, 2010 at 15:27:25 -0500:
> > Ramkumar:
> > > Again, I expect that access control/ security is automatically
taken care
> > > of in the RA layer. `svnrdump load` is just like a user making
some changes
> > > and committing them one by o
Steven Woody wrote:
> Thanks everyone, and, can I get know if the replication/write-through
> things support https?
Yes, they do.
> The master that I want to mirror is using https
On the mirror, you need the appropriate Apache modules and
configuration.
Make sure you have mod_proxy and mod_ssl l
Ulrich Eckhardt wrote:
> On Wednesday 11 August 2010, Ryan Schmidt wrote:
> > you can set up a write-through proxy so that people who check out
> > from a slave and try to commit will be transparently redirected to
> > the master.
>
> How?
It's described in the book:
http://svnbook.red-bean.com
Hi,
SVN decides if two repositories are "the same" by comparing their UUIDs.
You can get the Repository UUID from the old repository with "svn info",
and set it on the new repository with "svnadmin setuuid".
Kind regards,
Jon
From: Leszek Szarlej [mailto:les
Hi,
Les Mikesell wrote:
> On 8/6/2010 10:12 AM, Itamar O wrote:
> > On Fri, Aug 6, 2010 at 4:56 PM, JWalker > > This is my first post here.
> > >
> > > Is it possible to merge several repositories in a new empty
> > > repository?
> > >
> > > I am asking this, because I made several repositories o
Jim Lord wrote:
> I'm setting up a write-through proxy mirror. I can run:
>
> svnsync init --source-username svnsystem --source-password $pass
> --sync-username svnsystem --sync-password $pass
> file:///data/svn/vtest
> https://versiontest2.divxnetworks.com/svn/vtest
> from the slave machine
Hi,
kevin fauchon [mailto:kevin.fauc...@gmail.com] wrote:
> AuthzSVNAccessFile /DATA/svn/config
[...]
> /DATA/svn/conf:
> [/]
> * =
> anonymous = r
You need $anonymous here - you're missing the $. So you granted read
access to a user that's logged in with the username "anonymous", no
Hi,
Edward Ned Harvey wrote:
> I have tried everything I can think of, and I can't seem to get
> svn to build with the zlib that comes with it. It's always
> linking against /usr/lib64/zlib.
> After build:
> ldd `which svn` | grep libz
> libz.so.1 => /usr/lib64/libz.so.1 (0x0034a69000
Hi,
Didier Trosset wrote:
> I have a subversion server running with apache. It authenticates
> users using LDAP configuration and uses SVN path-based
> authorizations to limit user access to certain repositories.
> This works perfectly.
>
> Now, I have a service I want to setup (rietveld, for code
Hi,
"m g" wrote:
> Subject: JavaHL - when using peg makes the difference in diffSummarize()
>
> can you provide me at least one case in which passing
> a non-null peg revision to SVNClientInterface.diffSummarize()
> returns a different result than when passing null ?
>
> Thanks
> Mário
Have you r
TortoiseSVN, which directs me to this mailing list for
discussion. Pardon my amateurishness, could I use a local command line
client (while keeping Tortoise resident) to execute this?
-Original Message-----
From: Jon Foster [mailto:jon.fos...@cabot.co.uk]
Sent: Wednesday, April 14, 2010 7:23 AM
To
Hi,
You don't say what client you're using, but it doesn't seem to be the
Subversion command-line client. Try asking on the relevant mailing
list for your client.
If you were using the command-line client, you'd use
"svn unlock --force". See these pages for details:
http://svnbook.red-bean.com
Andy Levy wrote:
> David Bartmess wrote:
> > My company has done a preliminary spec for moving from CVS to
> > Subversion, using the python script cvs2svn. The cvs2svn script
> > works fine, but when I try to do an svnadmin load of the dump
> > file created, using the Assembla https URL, it compla
Hi,
> I'm using mod_authz to specify permissions in svn. Is there a way
> to list the group members on multiple lines instead of just a
> single line? For example, instead of:
>
> [groups]
> developers=joe, frank, bob
>
> I would like to have something like:
>
> [groups]
> developers=
> joe,
> f
Hi,
Tobias wrote:
> I have a project with two different repositories,
> that I want to merge into one common repository.
Would "svndumptool merge" do what you want?
http://svn.borg.ch/svndumptool/
(I haven't tried it, it's just something I found and
bookmarked when investigating Subversion)
>
Hi,
Arthur Chan wrote:
> I am requesting SVN checkin time from my previous company.
...
> However, they told me that SVN only store logs for 3 months
> by default so that all my commit time were lost.
There are 2 different places you can get "commit time" information.
First, there are the logs f
Hi,
Anton Prowse wrote:
[...]
> [/trunk/specialfile]
> user2 =
[...]
> when I authenticate as user2 I receive the following error
> when trying to create a branch from the trunk of "repos1":
> Server sent unexpected return value (403 Forbidden) in
> response to COPY request for '/repos/repos1/!svn
Hi,
Stefan Sperling wrote:
> On Wed, Mar 03, 2010 at 03:01:22PM -0600, Reid Priedhorsky wrote:
> > In particular, log messages to files not in
> > /cyclingproject/public should not be available.
>
> Log message are not per file. They are per revision.
> They aren't tied to any particular path.
> O
Hi,
Pete Hatton wrote:
> Anyone know the unsubscribe information for the old list?
I don't know the "official" procedure, but here's what I did:
1) Go to http://subversion.tigris.org/
2) Log in using the Login link at the top right corner of the page.
(The login page has a "Forgot your password
Hi,
Pat Farrell wrote:
> My debian server is running Lenny, the latest and greatest debian.
>
> The svn version is svn, version 1.5.1 (r32289)
> I'd like to be running 1.6.9
> I can't find the .deb files, or better, a good repository to add to my
> /etc/apt sources.list.
1.6.4 is available in the
Hi,
Soft [mailto:s...@gmx.ch] wrote:
> On Windows we use Tortoise 1.5.9 and Subclipse in Eclipse.
[...]
> Lets say I move a file to a working copy with the extension *.a. It
gets
> immediately marked as ignored.
[...]
> I did remove the comment on the global-ignores line. It didn't help.
*.a
> f
Hi,
^M is CR. Given the output of "cat", it looks like the file contained:
> > > /* This file is automatically generated from
> > > * subversion/libsvn_fs_fs/rep-cache-db.sql
> > > * Do not edit it directly, but edit the source file and rerun
'make'
> > > */
> > >
> > > #define REP_CACHE_DB_S
Kind regards,
Jon
[1] http://www.google.co.uk/search?q=man+flock%281%29
-Original Message-
From: Andersen, Krista [mailto:krista.ander...@itg.com]
Sent: 15 January 2010 22:29
To: Jon Foster; users@subversion.apache.org
Cc: ssi-svn_admin
Subject: RE: sync bug -> corrupted proxy repo
Tha
Hi,
Ryan Schmidt wrote:
> But Subversion blocks the commit until the post-commit is done.
That particular SVN client will be blocked. But if you have
two users committing at the same time, or if a user runs "svn"
twice in parallel, then the post-commit hook will be run in
parallel.
Here's how I
Hi,
James D. Parra [mailto:jam...@musicreports.com] wrote:
> Is there a way that I can repair this?
No idea, sorry. But:
> Is there a way to roll back to revision 11529 and start there?
Try svnadmin dump with the -r parameter to dump just the revisions
you want to keep, then svnadmin load to l
Hi,
Andersen, Krista [mailto:krista.ander...@itg.com] wrote:
> Twice I have seen one of my proxy repositories become corrupted due
> to an apparent bug in the svnsync sync process. Has anyone else
> seen this type of behavior from Subversion?
This is probably caused by issue 3546 [1][2]. This i
Hi,
Gabriel Ricardo wrote:
> I cannot figure out how to restrict permissions on a sub-directory.
> What I want is to have anonymous read/write access to everything
> except a sub-directory, where only two users have read/write and
> everyone else has no access (read or write). I've done a lot of
35 matches
Mail list logo
