[SCM] rsync branch, master, updated. v3.0.3-80-g7634fc8

[rsync-cvs at lists.samba.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "rsync".

The branch, master has been updated
       via  7634fc8eb613eec2950ad957dc638c920927ca1e (commit)
       via  daa8d920942f064b68f913eeb87da28753dc203a (commit)
      from  adc2476fa213797d849ae80fa8b5fcd9eba5dc4f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7634fc8eb613eec2950ad957dc638c920927ca1e
Author: Wayne Davison <wayned at samba.org>
Date:   Mon Sep 1 17:08:26 2008 -0700

    A little tidying up to follow my preferred style.

commit daa8d920942f064b68f913eeb87da28753dc203a
Author: Matt McCutchen <matt at mattmccutchen.net>
Date:   Mon Sep 1 17:01:19 2008 -0700

    Several fixes for merge file handling:
    - Free a mergelist's parent_dirscanned filters the last time it is
      popped or as soon as the filters are discarded due to the "n"
      modifier.  Aside from not leaking memory, this is needed to clean up
      any mergelists defined during the parent_dirscan to avoid crashing by
      trying to restore nonexistent state for them in pop_local_filters.
    - Make push_local_filters save the current mergelist_cnt, and make
      pop_local_filters assert that it has the correct number of mergelists
      before restoring their state.
    - Assert that mergelists get deactivated in strict LIFO order to catch
      any glitches as soon as they happen.  Free linked lists of filters in
      reverse order to make that the case.
    - Add a bunch of mergelist-related debug output (--debug=filter2).

-----------------------------------------------------------------------

Summary of changes:
 exclude.c |  157 ++++++++++++++++++++++++++++++++++++++++++++++++------------
 rsync.h   |    1 +
 2 files changed, 126 insertions(+), 32 deletions(-)


hooks/post-receive
--
rsync