On Mon, Aug 10, 2009 at 10:28 AM, Peter Kasting <pkasting@google.com> wrote:

On Mon, Aug 10, 2009 at 10:27 AM, Darin Adler <darin@apple.com> wrote:

...

$ resolve-ChangeLogs WebCore/ChangeLog svn: warning: '../../../../Volumes/Home/darin/Safari/OpenSource/WebCore/ChangeLog' is not a working copy WARNING: ../../../../Volumes/Home/darin/Safari/OpenSource/WebCore/ChangeLog is not in a conflicted state.

Anyone know who broke this?

I don't know, and haven't touched that any time recently, but since I fixed your prepare-ChangeLog problem I'll take a look at this one right now.

Hmm, not sure why ddkilzer's new code isn't working well. Try changing the last line of canonicalRelativePath() from: return File::Spec->abs2rel($absolutePath); to return File::Spec->abs2rel($absolutePath, Cwd::getcwd()); PK

On Mon, Aug 10, 2009 at 10:55 AM, Darin Adler <darin@apple.com> wrote:

On Aug 10, 2009, at 10:53 AM, Peter Kasting wrote:

Try changing the last line of canonicalRelativePath() from:

...

return File::Spec->abs2rel($absolutePath);

to

return File::Spec->abs2rel($absolutePath, Cwd::getcwd());

That seems to have fixed the problem.

Great. Fix landed in r46988. Thanks ddkilzer for a fast r+ :) PK