Guten Tag Zé,
am Freitag, 19. April 2013 um 08:30 schrieben Sie:
> I've been using subversion on a directory tree which has quite a lot of
> directories that start off with a plus sign and I'm getting error
> messages and problems committing changes which I never experienced before.
> Are plus s
On 4/19/13, Watson, Paul wrote:
> We have a diff utility designed for a proprietary file format. I would like
> for this "theappdiff" utility to be used if the file's svn:mine-type prop is
> application/the-app.
Hi Paul,
as far as I know, this feature is currently not available, but the
external
On 04/18/2013 09:59 PM, Watson, Paul wrote:
> We have a diff utility designed for a proprietary file format. I would
> like for this "theappdiff" utility to be used if the file's svn:mine-type
> prop is application/the-app.
>
> Is it possible for svn to invoke an external diff based on mime-type?
On Thu, 2013-04-18 at 07:18 -0700, BRM wrote:
> So what if you have changes to the local working copy?
> Or are you ensuring you have no other changes first?
Right, I'd ensure the files being modified in the patch have no changes
in my WC first.
>
> As Branko Čibej noted, the only clean way to d
From: C. Michael Pilato [mailto:cmpil...@collab.net]
> The Subversion command-line utility can't do this. But if you're a Windows
> user, you might be able to take advantage of TortoiseSVN's support for
> mapping MIME types to differencing tools. See the
> following for details:
I found that
"C. Michael Pilato" writes:
> On 04/18/2013 09:59 PM, Watson, Paul wrote:
>> We have a diff utility designed for a proprietary file format. I would
>> like for this "theappdiff" utility to be used if the file's svn:mine-type
>> prop is application/the-app.
>>
>> Is it possible for svn to invoke
On 04/19/2013 10:20 AM, Watson, Paul wrote:
> From: C. Michael Pilato [mailto:cmpil...@collab.net]
>> The Subversion command-line utility can't do this. But if you're a
>> Windows user, you might be able to take advantage of TortoiseSVN's
>> support for mapping MIME types to differencing tools. S
> Hi All
>
> We have a revision that contains a few changed files on the trunk:
> r345
> /usr/ext/a.java
> /usr/ext/b.java
>
> We like to merge this a branch working copy.
> Can we perform multiple merge svn with the same revision number ?
> We have a reason to do that; We know it doesnt make sen
>> I found that this can be done with the svn command line tools. However,
>> --force must be used. Without --force, svn will see that the file has
>> svn:mime-type prop set to application/octet-stream and refuse to do
>> anything to a binary file.
>
> I nearly suggested this earlier, but my testi
>> I found that this can be done with the svn command line tools. However,
>> --force must be used. Without --force, svn will see that the file has
>> svn:mime-type prop set to application/octet-stream and refuse to do
>> anything to a binary file.
>
> I nearly suggested this earlier, but my testi
>>>You know, in light of the fact you can use the runtime configuration to
>>>establish the constant use of an external diff tool, it seems that it would
>>>be beneficial to have another configuration knob that means "My external
>>>diff tool can handle binary files, too, so please assume --forc
On 04/19/2013 12:56 PM, Watson, Paul wrote:
You know, in light of the fact you can use the runtime
configuration to establish the constant use of an external diff
tool, it seems that it would be beneficial to have another
configuration knob that means "My external diff tool can
Hi Bob
Thanks for responding. I tried it and it seems to merge ok.
We're usng SVN 1.6
We tried using svn mergeinfo to help us with finding relevant revisions to
merge from a trunk to a branch.
But when we query for merged, (even for the one above),
svn mergeinfo --shows-revs merged
https://test.c
13 matches
Mail list logo
