Re: svn commit: r1376154 - in /subversion/branches/inheritable-props/subversion: libsvn_wc/upgrade.c libsvn_wc/wc-metadata.sql libsvn_wc/wc-queries.sql libsvn_wc/wc.h tests/libsvn_wc/db-test.c tests/libsvn_wc/entries-compat.c

On Thu, Aug 23, 2012 at 3:05 AM, Branko Čibej <brane_at_wandisco.com> wrote:
> On 23.08.2012 00:13, Bert Huijben wrote:
>> Note that the old bump_to_30 code (conflict handling stuff and index
>> fixes) was just waiting for the next format bump in order not to add
>> an unneeded extra format bump, so if you want to merge this back to
>> trunk before trunk is bumped your bump and the original bump to 30
>> should be a single format bump.

Ah, thanks for the explanation of what the old bump_to_30 was doing.
And got it: Single bump!

> Can you bump the merge to a bump in a separate bump?

I shouldn't read this stuff while drinking tea.

-- 
Paul T. Burba
CollabNet, Inc. -- www.collab.net -- Enterprise Cloud Development
Skype: ptburba
> --
> Certified & Supported Apache Subversion Downloads:
> http://www.wandisco.com/subversion/download
>