Re: Merge strategies?

2011-10-21 Thread Andrey Paramonov
e that we could also do this (in rather rare cases when we merge upstream) if we have mergeinfo filled for our release branches. Thank you for sharing your experience, Andrey Paramonov

Re: Merge strategies?

2011-10-20 Thread Andrey Paramonov
d how the mergeinfo about upstream merges could be really useful. Thank you for your valuable comments, Andrey Paramonov

Re: Merge strategies?

2011-10-20 Thread Andrey Paramonov
On 20.10.2011 17:55, Bob Archer wrote: On 19.10.2011 14:00, Stefan Sperling wrote: On Wed, Oct 19, 2011 at 12:22:05PM +0400, Andrey Paramonov wrote: What about my other fears, bloated svn:mergeinfo The entire svn:mergeinfo property is stored in RAM and parsed from string form into a data

Re: Merge strategies?

2011-10-19 Thread Andrey Paramonov
On 19.10.2011 14:00, Stefan Sperling wrote: On Wed, Oct 19, 2011 at 12:22:05PM +0400, Andrey Paramonov wrote: What about my other fears, bloated svn:mergeinfo The entire svn:mergeinfo property is stored in RAM and parsed from string form into a data structure (nested hash table) before it is

Re: Merge strategies?

2011-10-19 Thread Andrey Paramonov
On 19.10.2011 11:44, Johan Corveleyn wrote: On Wed, Oct 19, 2011 at 8:38 AM, Andrey Paramonov wrote: On 18.10.2011 20:05, Daniel Shahaf wrote: Andrey Paramonov wrote on Tue, Oct 18, 2011 at 11:40:37 +0400: What confuses people most now is the scattered svn:mergeinfo ("Oh, why that di

Re: Merge strategies?

2011-10-18 Thread Andrey Paramonov
On 18.10.2011 20:05, Daniel Shahaf wrote: Andrey Paramonov wrote on Tue, Oct 18, 2011 at 11:40:37 +0400: What confuses people most now is the scattered svn:mergeinfo ("Oh, why that dir has modified status, my merge shouldn't have changed it!"). Isn't this particular issu

Merge strategies?

2011-10-18 Thread Andrey Paramonov
(slowness) and conflicting (major annoyance). Maybe I'm missing something? Your comments greatly appreciated, Andrey Paramonov

Re: [Bug] [Subversion 1.7] svn blame doesn't work for locally modified files

2011-10-13 Thread Andrey Paramonov
On 13.10.2011 22:31, Ryan Schmidt wrote: On Oct 13, 2011, at 06:51, Andrey Paramonov wrote: I believe Subversion can automagically translate line ending sequences when transferring data to and from server. I use Windows, so I have CRLF sequences at the ends of the lines in my working copy

Re: [Bug] [Subversion 1.7] svn blame doesn't work for locally modified files

2011-10-13 Thread Andrey Paramonov
On 13.10.2011 15:54, Daniel Shahaf wrote: Andrey Paramonov wrote on Thu, Oct 13, 2011 at 15:51:46 +0400: On 13.10.2011 15:42, Stefan Sperling wrote: On Thu, Oct 13, 2011 at 03:37:36PM +0400, Andrey Paramonov wrote: On 13.10.2011 15:24, Daniel Shahaf wrote: No, it's a feature, showing

Re: [Bug] [Subversion 1.7] svn blame doesn't work for locally modified files

2011-10-13 Thread Andrey Paramonov
On 13.10.2011 15:42, Stefan Sperling wrote: On Thu, Oct 13, 2011 at 03:37:36PM +0400, Andrey Paramonov wrote: On 13.10.2011 15:24, Daniel Shahaf wrote: No, it's a feature, showing that those lines are new in the locally-modified version. You can do % svn blame file@BASE for the old beha

Re: [Bug] [Subversion 1.7] svn blame doesn't work for locally modified files

2011-10-13 Thread Andrey Paramonov
I get "- -" for all lines, not just locally modified ones. svn blame file@BASE works, thanks. My server is of version 1.6, if it matters. Best wishes, Andrey Paramonov Andrey Paramonov wrote on Thu, Oct 13, 2011 at 13:14:35 +0400: Hello! To reproduce: 0) Checkout a working cop

[Bug] [Subversion 1.7] svn blame doesn't work for locally modified files

2011-10-13 Thread Andrey Paramonov
available. This is a regression compared to 1.6.12. Best wishes, Andrey Paramonov