> I have a couple minor concerns, and I gather the logic for when to pull
> the closed tree is not quite right...?
Right, it works with current developer.sh environments, but not with the
improved ones we're about to putback (like first thing on Tuesday).
> First issue: you replaced "$SRC/../closed" with
> "$CODEMGR_WS/usr/closed", but not everywhere. Is there a particular
> reason for making that change? I'd like to see the rationale in the
> Bugster entry, so that people aren't left wondering in the future.
Style. The use of "$SRC/../closed" bothers me, so I fixed the ones that
glared at me while making these changes, but didn't do a global
seek/destroy.
No effective difference, those changes are tangential to this fix.
> Perhaps more important, I'd like to see a single idiom used throughout
> nightly.sh, so that people aren't scratching their heads over why
> $SRC/../closed is used in some places and $CODEMGR_WS/usr/closed is used
> in others.
We already violate that, which doesn't mean it's OK, just that it still
doesn't tell us which should be preferred.
> Maybe the references should all be changed to $CLOSEDSRC (or some other
> appropriately named and initialized variable)?
Seems reasonable, though it would probably be CLOSEDROOT or somesuch.
> Second issue: can you show an example of the mail message with the new
> merge warning/error messages? I'm wondering if it's possible to make
> the messages sufficiently visible without resorting to visual bells like
> "***". Such visual bells seem likely to accumulate over time, making
> the mail message increasingly noisy, leading to louder bells, and so on.
Attached. Neither message will appear in the nominal (no merge required)
case.
Like with bringover, we just let hg pull (hg later hg merge) output go
straight into the mail_msg. But that leaves us with some
difficult-to-parse text. If anything, that output should maybe be
massaged, but I think it's useful, so I'm open to suggestions.
--Mark
-------------- next part --------------
>From mjnelson at opensores.central.sun.com Wed Jul 30 14:58:14 2008
Date: Wed, 30 Jul 2008 14:58:00 -0600 (MDT)
From: Mark Nelson <mjnel...@opensores.central.sun.com>
To: mjnelson at opensores.central.sun.com
Subject: Nightly i386 Build of onnv-bugfixes Failed.
==== Nightly distributed build started: Wed Jul 30 14:57:59 MDT 2008 ====
Build project: group.staff
Build taskid: 1621
==== Nightly argument issues ====
==== Build version ====
onnv-bugfixes
==== BRINGOVER LOG ====
pulling from /home/mjnelson/tmp/nightly_test_repos/hgparent
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
pulling from /home/mjnelson/tmp/nightly_test_repos/hgparent/usr/closed
searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
merging usr/parentfile
merging usr/parentfile failed!
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 4
hg merge 5
***
*** In repository /home/mjnelson/tmp/nightly_test_repos/onnv-bugfixes:
***
*** nightly was unable to automatically merge your changes.
*** Run hg merge manually, then restart nightly with -n.
***
merging closedfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
***
*** In repository
/home/mjnelson/tmp/nightly_test_repos/onnv-bugfixes/usr/closed:
***
*** nightly successfully merged your changes. This means that your working
*** directory has been updated, but those changes are not yet committed.
*** After nightly completes, you should validate the results of the merge,
*** then use hg commit manually.
***
trouble with bringover, quitting at Wed Jul 30 14:58:00 MDT 2008.
