Ok, after much useful feedback, and finally acknowledging that nightly.sh
needed some significant code reorganization, here's where I ended up:
http://cr.opensolaris.org/~mjnelson/webrev.nightly.3/
I have attached four different notes to this one, with various
combinations of sample output.
I don't think it will ever be pretty, but I think it's more legible now.
Tim, I hate you.
--Mark
-------------- next part --------------
>From mjnelson at opensores.central.sun.com Fri Aug 1 01:14:52 2008
Date: Fri, 01 Aug 2008 01:14:50 -0600 (MDT)
From: Mark Nelson <[email protected]>
To: mjnelson at opensores.central.sun.com
Subject: Nightly i386 Build of onnv-bugfixes Failed.
==== Nightly distributed build started: Fri Aug 1 01:14:49 MDT 2008 ====
Build project: group.staff
Build taskid: 152
==== Nightly argument issues ====
==== Build version ====
onnv-bugfixes
==== BRINGOVER LOG ====
updated /home/mjnelson/tmp/nightly_test_repos/onnv-bugfixes with the following
results:
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)
merging usr/parentfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
***
*** 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.
***
updated /home/mjnelson/tmp/nightly_test_repos/onnv-bugfixes/usr/closed with the
following results:
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 closedfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
***
*** 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.
***
==== Running POST_BRINGOVER command:
/home/mjnelson/tmp/nightly_test_repos/postbhk ====
exiting prematurely at Fri Aug 1 01:14:50 MDT 2008
Aborting at request of POST_BRINGOVER
-------------- next part --------------
>From mjnelson at opensores.central.sun.com Fri Aug 1 01:13:05 2008
Date: Fri, 01 Aug 2008 01:13:00 -0600 (MDT)
From: Mark Nelson <[email protected]>
To: mjnelson at opensores.central.sun.com
Subject: Nightly i386 Build of onnv-bugfixes Failed.
==== Nightly distributed build started: Fri Aug 1 01:12:59 MDT 2008 ====
Build project: group.staff
Build taskid: 151
==== Nightly argument issues ====
==== Build version ====
onnv-bugfixes
==== BRINGOVER LOG ====
updated /home/mjnelson/tmp/nightly_test_repos/onnv-bugfixes with the following
results:
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
merging usr/parentfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
***
*** 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.
***
updated /home/mjnelson/tmp/nightly_test_repos/onnv-bugfixes/usr/closed with the
following results:
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
merging closedfile
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
***
*** 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.
***
==== Running POST_BRINGOVER command:
/home/mjnelson/tmp/nightly_test_repos/postbhk ====
exiting prematurely at Fri Aug 1 01:13:00 MDT 2008
Aborting at request of POST_BRINGOVER
-------------- next part --------------
>From mjnelson at opensores.central.sun.com Fri Aug 1 01:16:34 2008
Date: Fri, 01 Aug 2008 01:16:28 -0600 (MDT)
From: Mark Nelson <[email protected]>
To: mjnelson at opensores.central.sun.com
Subject: Nightly i386 Build of onnv-bugfixes Failed.
==== Nightly distributed build started: Fri Aug 1 01:16:27 MDT 2008 ====
Build project: group.staff
Build taskid: 153
==== Nightly argument issues ====
==== Build version ====
onnv-bugfixes
==== BRINGOVER LOG ====
/home/mjnelson/tmp/nightly_test_repos/onnv-bugfixes: merge failed as follows:
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)
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 3
hg merge 4
***
*** nightly was unable to automatically merge your changes. You should
*** redo the full merge manually, following the steps outlined by mercurial
*** above, then restart nightly with -n.
***
trouble with bringover, quitting at Fri Aug 1 01:16:27 MDT 2008.
-------------- next part --------------
>From mjnelson at opensores.central.sun.com Fri Aug 1 01:18:26 2008
Date: Fri, 01 Aug 2008 01:18:21 -0600 (MDT)
From: Mark Nelson <[email protected]>
To: mjnelson at opensores.central.sun.com
Subject: Nightly i386 Build of onnv-bugfixes Failed.
==== Nightly distributed build started: Fri Aug 1 01:18:20 MDT 2008 ====
Build project: group.staff
Build taskid: 154
==== Nightly argument issues ====
==== Build version ====
onnv-bugfixes
==== BRINGOVER LOG ====
updated /home/mjnelson/tmp/nightly_test_repos/onnv-bugfixes with the following
results:
pulling from /home/mjnelson/tmp/nightly_test_repos/hgparent
searching for changes
no changes found
closed merge failed as follows:
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 closedfile
merging closedfile 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 3
hg merge 4
***
*** nightly was unable to automatically merge your changes. You should
*** redo the full merge manually, following the steps outlined by mercurial
*** above, then restart nightly with -n.
***
trouble with bringover, quitting at Fri Aug 1 01:18:21 MDT 2008.
