Hi,
In the old days the .svn folder was in every folder and resolving a tree
conflict was as easy as deleting the conflicting folder and doing an
update. This solved 90% of our issues.
This is no longer possible as the only the .svn is now at the root of
the whole project!
I assume there are s
I have not upgraded to Subversion 1.7 yet. I'm still on 1.6.17.
One reason is that there is a script I like to use, that I wrote, called
svntwdiff. It goes like this:
$ cat svntwdiff
#!/bin/bash
if [ -z "$1" ]; then
echo "usage: $0 "
exit 1
fi
FILE="$1"
FILEDIR="$(dirname "${FILE}")"
Am 13.04.2012 10:55, schrieb Ryan Schmidt:
> "twdiff" is a command-line wrapper that comes with the GUI
> TextWrangler editor; it opens the two given textfiles in TextWrangler
> and lets me view and edit the differences between files. I often use
> svntwdiff to examine changes in a file and selecti
Ryan Schmidt wrote on Fri, Apr 13, 2012 at 03:55:34 -0500:
> I have not upgraded to Subversion 1.7 yet. I'm still on 1.6.17.
>
> One reason is that there is a script I like to use, that I wrote, called
> svntwdiff. It goes like this:
>
>
> $ cat svntwdiff
> #!/bin/bash
>
You could use #!/bin
On Apr 13, 2012, at 04:43, Daniel Shahaf wrote:
> Ryan Schmidt wrote on Fri, Apr 13, 2012 at 03:55:34 -0500:
>
>> How can I modify this script to be compatible with a Subversion 1.7
>> format working copy?
>
> 1.7-specific, relies on implementation details:
> `svn info`[Working Copy Root Dir]`/
Ryan Schmidt wrote on Fri, Apr 13, 2012 at 04:55:17 -0500:
>
> On Apr 13, 2012, at 04:43, Daniel Shahaf wrote:
>
> > 1.x-compatible:
> > use 'svn cat' to obtain a tempfile.
>
> That's a good idea. It sounds like this would be less work and
> automatically backward- and future-compatible.
Indee
On Apr 13, 2012, at 04:58, Daniel Shahaf wrote:
> Ryan Schmidt wrote on Fri, Apr 13, 2012 at 04:55:17 -0500:
>>
>> On Apr 13, 2012, at 04:43, Daniel Shahaf wrote:
>>
>>> 1.x-compatible:
>>> use 'svn cat' to obtain a tempfile.
>>
>> That's a good idea. It sounds like this would be less work an
On Fri, Apr 13, 2012 at 10:27:15AM +0200, Sune Fischer wrote:
> Hi,
>
> In the old days the .svn folder was in every folder and resolving a
> tree conflict was as easy as deleting the conflicting folder and
> doing an update. This solved 90% of our issues.
> This is no longer possible as the only
Ryan Schmidt wrote on Fri, Apr 13, 2012 at 05:28:41 -0500:
>
> On Apr 13, 2012, at 04:58, Daniel Shahaf wrote:
>
> > Ryan Schmidt wrote on Fri, Apr 13, 2012 at 04:55:17 -0500:
> >>
> >> On Apr 13, 2012, at 04:43, Daniel Shahaf wrote:
> >>
> >>> 1.x-compatible:
> >>> use 'svn cat' to obtain a te
> -Original Message-
> From: Sune Fischer [mailto:suneprogram...@gmail.com]
> Sent: vrijdag 13 april 2012 10:27
> To: users@subversion.apache.org
> Subject: Feature request: Easy tree conflick resolve mechanism
>
> Hi,
>
> In the old days the .svn folder was in every folder and resolvin
svnrdump fails when access control restrictions are in place on the
server and the --incremental option is not used. The message returned
is "authorization failed". This does not occur when the --incremental
option occurs. The svnrdump command is version 1.7.2.
When --incremental isn't used svnrdump tries to dump the full tree and
runs into the authz restrictions. Do you have a suggestion for an
alternative behaviour?
Andrew Sasak wrote on Fri, Apr 13, 2012 at 11:58:50 -0400:
> svnrdump fails when access control restrictions are in place on the
> server
When --incremental is used, dump records all changes that the user has
access to. When --incremental is used, I think dump should dump the
whole tree that the user has access to. I can imagine that this would
be a non-trivial change for an uncommon use case.
On Fri, Apr 13, 2012 at 1:25 PM, Daniel
On Thu, Apr 12, 2012 at 9:15 AM, Stefan Sperling wrote:
> I'm happy to announce the release of Apache Subversion 1.6.18.
>
Cool. I got 1.6.17 in the pipeline for Repoforge publication, and I can
build and test this minor release for RHEL compatibility. It'll take a few
hours for all the environme
14 matches
Mail list logo
