Re: Merge strategies?

2011-10-18 Thread Daniel Shahaf
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 issue fixed in 1.7?

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 issue fixed in 1.7? No, i

Re: Merge strategies?

2011-10-19 Thread Johan Corveleyn
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 dir has modified status, my merge >>> sh

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 dir has m

Re: Merge strategies?

2011-10-19 Thread Stefan Sperling
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 used. With modern hardware, you'd have to hit s

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 u

RE: Merge strategies?

2011-10-20 Thread Bob Archer
> 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 tab

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 stru

RE: Merge strategies?

2011-10-20 Thread Bob Archer
> 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 >

Re: Merge strategies?

2011-10-20 Thread Andrey Paramonov
On 21.10.2011 1:56, Bob Archer wrote: 1) Do you usually merge upstream or downstream? 2) Do you set mergeinfo when merging downstream? 3) Do you set mergeinfo when merging upstream? 4) Do you set mergeinfo when merging from feature branch? 1) We generally only merge up version. A fix is made i

RE: Merge strategies?

2011-10-21 Thread Bob Archer
> On 21.10.2011 1:56, Bob Archer wrote: > >> 1) Do you usually merge upstream or downstream? > >> 2) Do you set mergeinfo when merging downstream? > >> 3) Do you set mergeinfo when merging upstream? > >> 4) Do you set mergeinfo when merging from feature branch? > >> > > > > 1) We generally only mer

Re: Merge strategies?

2011-10-21 Thread Andrey Paramonov
On 21.10.2011 17:32, Bob Archer wrote: Hm, it looks like you should have really huge svn:mergeinfo in your latest VersionX. Did you notice any slowdown? I'm not sure I would call it huge. Here is the mergeinfo on our newest in dev version path root: /Product/branches/B_01490:39129-39612 /Pro

RE: Merge strategies?

2011-10-21 Thread Bob Archer
> On 21.10.2011 17:32, Bob Archer wrote: > >> Hm, it looks like you should have really huge svn:mergeinfo in your > >> latest VersionX. Did you notice any slowdown? > > > > I'm not sure I would call it huge. Here is the mergeinfo on our newest in > dev version path root: > > > > /Product/branches/