Kamesh, thanks for testing. I'm not able to reproduce this behavior,
however:
$ ./merge_tests.py 7 8 16
PASS: merge_tests.py 7: merge should not die if a target file is absent
PASS: merge_tests.py 8: merge on deleted directory in target
PASS: merge_tests.py 16: merge should skip over unversioned obstructions
Perhaps you have some local modifications where are causing this
problem (or need to do a clean build)?
- Dan
On Fri, 15 Sep 2006, Kamesh Jayachandran wrote:
> After this fix merge-tests.py 7, 8, 16 started failing which earlier
> used to succeed.
...
> >On the merge-tracking branch: Handle skip notifications encountered
> >while performing a merge. If all changes in a merge are skipped, no
> >merge info is recorded for the target. If only some changes are
> >skipped, merge info is recorded for the target, and recorded as empty
> >(or with no modifications, if there is pre-existing merge info) for
> >the skipped items.
> >
> >Open question: When directories are skipped, should we record merge
> >info for its children (to avoid them being overridden to having no
> >merge info from the merge), or are they too considered skipped?
> >
> >* TODO
> > Update for fix to merge test #3.
> >
> >* subversion/libsvn_client/diff.c
> > (notification_receiver_baton_t): Add new nbr_notifications field, a
> > counter for the number of notifications occurring over the coure of
> > a merge.
> >
> > (notification_receiver): Increment BATON->nbr_notifications.
> >
> > (determine_merges_performed): Avoid recording any merge info when
> > all paths touched by a merge are skipped. Add question about
> > children of a skipped directory.
> >
> > (do_merge, do_single_file_merge): Initialize nbr_notifications to 0,
> > and clear the counter after merging a revision range.
> >
> >* subversion/tests/cmdline/merge_tests.py
> > (delete_file_and_dir): Fix test, accounting for the fact that we no
> > longer record merge info when all paths touched by a merge are
> > skipped.
...
- application/pgp-signature attachment: stored
Received on Fri Sep 15 20:05:37 2006