On Mon, Jun 16, 2008 at 01:40:21PM +0800, Rui, Guo wrote:
> > >>
> > >> I realize it's not your code, but I find the reuse of "entries"
> > >> confusing here, and wish there were a separate, block-local variable
> > >> named "parent_entries" or something. Do you agree?
> > >
> > > Yep! Done, waiting for commit.
> >
> > Oh -- please do that on trunk (+1 from me), and just have it come over
> > to the branch the next time you merge.
>
> Err.. My fault. I've done this on my branch after I checked all your reviews,
> along with your other suggestions. So, to fix this problem, should I merge it
> to trunk or submit a patch? Or even revert that commit and redo it in trunk?
>
I reverted this portion of the commit in my branch and redone it in the trunk.
I think this fixes my mistake. And I would like to ask a question about
mergeing: How often do you do it when you are working on your branch? I heard
that one may have problem next time if he does't do it frequent enough.
Rui
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-06-17 15:05:19 CEST