Hello everybody,
I have discovered a scenario when svn merge --reintegrate results in a false
text conflict set on a binary file.
The scenario is simple:
1. add any binary file to the trunk,
2. create a branch from the trunk,
3. modify the binary at the trunk,
4. merge changes from trunk to the
On Monday 21 December 2009 21:12:51 Leslie Turriff wrote:
> On Monday 21 December 2009 19:21:08 Ryan Schmidt wrote:
> > On Dec 21, 2009, at 18:16, Leslie Turriff wrote:
> > http://subversion.tigris.org/faq.html#in-place-import
>
> Um. I think I'll go back and re-read the book. :-)
>
On Monday 21 December 2009 19:21:08 Ryan Schmidt wrote:
> On Dec 21, 2009, at 18:16, Leslie Turriff wrote:
> > So I run svnadmin create, and it seems to have worked, but when
> > I try to add entities to the repository I get these messages:
> >
> > svn: '.' is not a working copy
> > svn: Can't
Ah, thanks for your response. I found my problem. I certainly did
try the workaround, but after your response I thought again about my
testing and setup. A simple oversight skewed my test results. I
first logged into the restricted svn URL using proper
username/password. I then tested the anon
On Dec 21, 2009, at 18:16, Leslie Turriff wrote:
> So I run svnadmin create, and it seems to have worked, but when
> I try to add entities to the repository I get these messages:
>
> svn: '.' is not a working copy
> svn: Can't open file '.svn/entries': No such file or directory
> turr...@
See my comment on the blog post, Gabriel. Did you actually *test* my
workaround, or are you speculating based on your understanding of the theory
of it. I'm happy to address actual problems found in the workaround --
*very happy*, in fact, since I'm using the workaround myself to protect
private
Hi,
I'm just starting to explore using svn. I have downloaded and
read /Version Control with Subversion For Subversion 1.5 (Compiled
from r3305)/. I have installed svn and svnserve on my home computer
(running openSuSE 11.0), and it appears to be done right, as far as I
can see.
Hi Jon,
The link you sent was helpful and the final workaround mentioned in
the article seems to work, except one thing...
There seems to be a security hole, which is that web-browsing of the
restricted sub-directory is still possible using the anonymous-open
URL. Thus, the solution does not seem
Hello,
My svn server has a debian 4.0, apache 2.2.3-4+etch11 installed with
apt-get, an d svn 1.4.2dfsg1-3. The svn auth is through ldap.
My problem is very strange and difficult to reproduce: Sometimes, when
an user tries to do an update, co or ci, a signal de timeout is showed.
Then you do an c
Hello,
My svn server has a debian 4.0, apache 2.2.3-4+etch11 installed with
apt-get, an d svn 1.4.2dfsg1-3. The svn auth is through ldap.
My problem is very strange and difficult to reproduce: Sometimes, when
an user tries to do an update, co or ci, a signal de timeout is showed.
Then you do an c
Hi,
I'm looking for some benchmark test utility to test speed and
performance of the BDB and FSFS backends, but could not find anything.
Does anybody know about any utility or script suitable for this purpose?
Thanks to any advice.
--
Regards
Honza Horak
E-mail: horak.ho...@gmail.com
Konstantin Kolinko wrote:
How can I determine if there were commits on a specific date?
For example: (some day one year ago)
svn diff --summarize -r {2008-12-20}:{2008-12-21}
http://svn.collab.net/repos/svn/trunk/
Ah, the --summarize switch is quite helpful, thank you.
- Dennis
2009/12/21 Dennis Jones :
> Hi,
>
> Is there a simple way to determine if there were any commits on a repository
> path given a specific date?
>
> 'svn log' doesn't give the results one might expect. For example, if there
> were no commits yesterday (12/20/2009), and I say:
>
> svn log -r {2009
On Mon, Dec 21, 2009 at 11:51, Dennis Jones
wrote:
> Hi,
>
> Is there a simple way to determine if there were any commits on a repository
> path given a specific date?
>
> 'svn log' doesn't give the results one might expect. For example, if there
> were no commits yesterday (12/20/2009), and I sa
Hi,
Is there a simple way to determine if there were any commits on a repository
path given a specific date?
'svn log' doesn't give the results one might expect. For example, if there
were no commits yesterday (12/20/2009), and I say:
svn log -r {2009-12-20}:{2009-12-21}
. . . then inst
up ?
--
BADIN Guillaume
Appartement 405
2 promenade des sapeurs pompiers
94800 Villejuif
On Wed, Dec 16, 2009 at 9:16 AM, Guillaume wrote:
>
> My problem is not on ACID Transaction, my problem is that we have 3
> different projects.
> These projects are dependent but are not in the same reposit
16 matches
Mail list logo
