>>>>> "Nathan" == Nathan Bush <nathan.bush at sun.com> writes:
Nathan> webrev tries to execute "hg diff -g -r $HG_PARENT $CWS/$DIR/$F". Nathan> In the case of this file, there is a strange discrepancy and the Nathan> rename is getting lost. For example, if I try the same command Nathan> manually, it is shown as a new file: Yeah, there's something funny going on with showing renames, probably having to do with merges and crossing branches. i.confupdate got "deleted" in changeset: 6242:602002289880 user: James Carlson <james.d.carlson at sun.com> date: Thu Feb 21 15:08:13 2008 -0500 summary: 268 class action scripts that rely on #ident may do evil things There are subsequent merges with onnv-gate at changeset: 6350:87c106c853e6 parent: 6246:98eed3a46994 parent: 6349:0f466480ceaf changeset: 6412:97fc0ef1caad parent: 6355:aca550e97174 parent: 6411:8c4c42921dd1 changeset: 6554:02e097f42c06 parent: 6416:f538cb902750 parent: 6553:eec05ec913e7 If you think of the repo as having two unnamed branches, one for onnv-scm development and one for onnv-gate, then diffs against the onnv-scm branch always show the expected result, and diffs against the onnv-gate branch show the file as new. athyra$ pwd /net/athyra/export/kupfer/tonic/src/onnv-scm/deleted_files/usr/src/pkgdefs/common_files athyra$ hg diff -g -r 6246 i.confupdate | head athyra$ hg diff -g -r 6349 i.confupdate | head diff --git a/deleted_files/usr/src/pkgdefs/common_files/i.confupdate b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate new file mode 100644 --- /dev/null +++ b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate @@ -0,0 +1,85 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the athyra$ hg diff -g -r 6350 i.confupdate | head athyra$ hg diff -g -r 6355 i.confupdate | head athyra$ hg diff -g -r 6411 i.confupdate | head diff --git a/deleted_files/usr/src/pkgdefs/common_files/i.confupdate b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate new file mode 100644 --- /dev/null +++ b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate @@ -0,0 +1,85 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the athyra$ hg diff -g -r 6412 i.confupdate | head athyra$ hg diff -g -r 6416 i.confupdate | head athyra$ hg diff -g -r 6553 i.confupdate | head diff --git a/deleted_files/usr/src/pkgdefs/common_files/i.confupdate b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate new file mode 100644 --- /dev/null +++ b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate @@ -0,0 +1,85 @@ +#!/bin/sh +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the athyra$ hg diff -g -r 6554 i.confupdate | head athyra$ But if you compare against changesets prior to the "deletion" changeset, both the onnv-scm branch and the onnv-gate branch show the rename. The first merge prior to the deletion is: changeset: 6240:6b81e0d7f1b1 parent: 6168:e6a4d3ced21d parent: 6239:b578f00bc056 athyra$ hg diff -g -r 6240 i.confupdate | head diff --git a/usr/src/pkgdefs/common_files/i.confupdate b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate copy from usr/src/pkgdefs/common_files/i.confupdate copy to deleted_files/usr/src/pkgdefs/common_files/i.confupdate athyra$ hg diff -g -r 6168 i.confupdate | head diff --git a/usr/src/pkgdefs/common_files/i.confupdate b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate copy from usr/src/pkgdefs/common_files/i.confupdate copy to deleted_files/usr/src/pkgdefs/common_files/i.confupdate athyra$ hg diff -g -r 6239 i.confupdate | head diff --git a/usr/src/pkgdefs/common_files/i.confupdate b/deleted_files/usr/src/pkgdefs/common_files/i.confupdate copy from usr/src/pkgdefs/common_files/i.confupdate copy to deleted_files/usr/src/pkgdefs/common_files/i.confupdate athyra$ I wish I understood the implications of this, especially for Cadmium. mike
