merge status of sparse-directories branch

[Karl Fogel <kf...@red-bean.com>]

Daniel Rall <dl...@collab.net> writes:
> On Wed, 14 Mar 2007, Erik Huelsmann wrote:
>> On 3/14/07, Justin Erenkrantz <ju...@erenkrantz.com> wrote:
>> >On 3/14/07, Karl Fogel <kf...@red-bean.com> wrote:
>> >> Folks, what say?  Just do it?  Are you ready to lend a hand?
>> >
>> >Merge it already!  We'll pick up the pieces if it breaks.  =)
>> 
>> +1
>
> Uh, didn't we already have this conversation?  +1!!

So, tonight I prepared the branch for merging (see r23833 and r23832),
and then did merge it into my trunk working copy.  Before committing,
I built and ran 'make check'.  To my surprise, diff_tests.py 33
failed.  Based on the error message, it looks like it's due to r23782
(which added input validation when reading working-size from
.svn/entries), not to any problem in the sparse-directories code.

I haven't finished debugging this, I just wanted to let everyone know
where the merge stands.  If you have a spare moment tomorrow, take a
look.  I won't be online until the early afternoon to resume anyway.

Also, http://pastebin.ca/395744 contains the in-progress patch I was
working on in the sparse-directories branch when I decided to back it
out to prepare for merge to trunk instead.  The patch adds 'depth' to
the svn_wc_get_status_editor() API.  I don't expect you to do anything
with it (except review if you want to), this is just my way of backing
it up :-).  Once the branch is merged, this patch should apply to
trunk just as cleanly.

-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org

Re: merge status of sparse-directories branch

[Erik Huelsmann <eh...@gmail.com>]

On 3/15/07, Karl Fogel <kf...@red-bean.com> wrote:
> Daniel Rall <dl...@collab.net> writes:
> > On Wed, 14 Mar 2007, Erik Huelsmann wrote:
> >> On 3/14/07, Justin Erenkrantz <ju...@erenkrantz.com> wrote:
> >> >On 3/14/07, Karl Fogel <kf...@red-bean.com> wrote:
> >> >> Folks, what say?  Just do it?  Are you ready to lend a hand?
> >> >
> >> >Merge it already!  We'll pick up the pieces if it breaks.  =)
> >>
> >> +1
> >
> > Uh, didn't we already have this conversation?  +1!!
>
> So, tonight I prepared the branch for merging (see r23833 and r23832),
> and then did merge it into my trunk working copy.  Before committing,
> I built and ran 'make check'.  To my surprise, diff_tests.py 33
> failed.  Based on the error message, it looks like it's due to r23782
> (which added input validation when reading working-size from
> .svn/entries), not to any problem in the sparse-directories code.
>
> I haven't finished debugging this, I just wanted to let everyone know
> where the merge stands.  If you have a spare moment tomorrow, take a
> look.  I won't be online until the early afternoon to resume anyway.

Karl, being at work, I don't have access to all this information in a
way that I can analyse, but, probably, you're trying to replace the
content of a file with other content of the same length. If you do,
you have to add an extra instruction to the test to make it sleep for
timestamps:

svntest.actions.do_sleep_for_timestamps()

HTH,

Erik.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org