>>>>> "Bill" == Bill Sommerfeld <sommerfeld at sun.com> writes:
Bill> I think it might be worth including a sanity check showing diffs
Bill> between /ws/onnv-clone and the mercurial equivalent, since that's
Bill> presumably the only thing that could cause cause heartache for the
Bill> diff | patch.
I'm not sure I follow. Do you mean something like
if patch failed; then
echo "checking for inconsistent parents"
diff -u $codemgr_parent/$file $hg_ws/$file.orig
fi
?
Or do you mean something more like
for f in $active_files; do
if ! diff $codemgr_parent/$f $hg_ws/$f; then
warn "$f is out of sync in $codemgr_parent and $hg_ws"
fi
done
before applying the content changes?
Bill> once /ws/onnv-clone stops changing this gets easier - you can tag
Bill> the mercurial clone with the equivalent label and do an initial
Bill> checkout of that revision, then leave it to the developer to merge
Bill> up to the tip in hg-land.
Ah, interesting point. I hadn't thought about workspace conversions
after we move the gate, but yeah, we'll need to support that.
It should be easy enough to revert back to the magic tag and then
require the developer to merge.
My first reaction was to have the script do the revert automagically
(once we know what the magic tag is), but that might be risky. Should I
add a -r <rev> option to wx2hg, and change the script to revert to <rev>
before applying the developer's changes?
mike
