Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: Changed order when diffing with --depth option

subversion
Discussion topic

Back to topic list

Re: Changed order when diffing with --depth option

Author stsp
Full name Stefan Sperling
Date 2009-08-04 04:30:47 PDT
Message On Tue, Aug 04, 2009 at 01:00:51PM +0200, Daniel Näslund wrote:
> > Hi Daniel,
> >
> > I've attached an updated patch this time which includes my suggested
> > changes. Please check my version of the patch to see if you are happy
> > with it.
> >
> >
> > I've slightly tested the attached patch now and produces splendid
> > diffs for multi-line property values. Thanks a lot! :)
> >
> > Before we commit this, as a final verification step, can you take the
> > time to run 'make check' on the patch and clean up any fallout in the
> > test suite? Or have you run the regression tests on this already?
> >
> > Thanks,
> > Stefan
>
> When running depth_tests.py 19 and diff_tests.py 42 I get failures.
> Theese two test uses the --depth option for diffing. The tests display
> the diffs for each target from the top of the tree and downward. That
> is:
>
> top_dir -
> | file
> |--subdir
>
> will be displayed in order top_dir-file-subdir if depth is set to
> infinity. But after applying the patch for issue 1493 the order is
> subdir-file-top_dir. How can that be? AFAIK I haven't touch anything
> that handles the depth. Using other the other depth options (empty,
> files, immediates) produces the same result. The targets are displayed
> from bottom up instead of up to down.

If I remember correctly the order which 'svn diff' uses for its
files is undefined. Julian wanted to fix this ages ago but for some
reason his patch wasn't applied.

So if the test assumes a fixed order, it's broken.

Stefan

« Previous message in topic | 7 of 11 | Next message in topic »

Messages

Show all messages in topic

[PATCH] issue 1493 - use libsvn_diff for diffing props Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-07-24 11:07:21 PDT
     Re: [PATCH] issue 1493 - use libsvn_diff for diffing props stsp Stefan Sperling 2009-07-24 12:13:46 PDT
         Re: [PATCH] issue 1493 - use libsvn_diff for diffing props Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-07-24 14:03:20 PDT
         Re: [PATCH] issue 1493 - use libsvn_diff for diffing props Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-07-27 03:48:33 PDT
             Re: [PATCH] issue 1493 - use libsvn_diff for diffing props stsp Stefan Sperling 2009-08-03 10:23:59 PDT
                 Changed order when diffing with --depth option Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-08-04 04:00:57 PDT
                     Re: Changed order when diffing with --depth option stsp Stefan Sperling 2009-08-04 04:30:47 PDT
                 [PATCH v3] issue 1493 - use libsvndiff for diffing properties Daniel Näslund <daniel at longitudo dot com> Daniel Näslund <daniel at longitudo dot com> 2009-08-04 10:55:32 PDT
                     Re: [PATCH v3] issue 1493 - use libsvndiff for diffing properties Daniel Shahaf <d dot s at daniel dot shahaf dot name> Daniel Shahaf <d dot s at daniel dot shahaf dot name> 2009-08-04 17:18:01 PDT
     Re: [PATCH] issue 1493 - use libsvn_diff for diffing props glasser David Glasser 2009-07-27 18:21:24 PDT
         Re: [PATCH] issue 1493 - use libsvn_diff for diffing props stsp Stefan Sperling 2009-07-28 10:05:43 PDT
Messages per page: