<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">
<br class="">
<div><br class="">
<blockquote type="cite" class="">
<div class="">On 12 Jan 2019, at 19:55, Matthew Knepley via petsc-dev <<a href="mailto:petsc-dev@mcs.anl.gov" class="">petsc-dev@mcs.anl.gov</a>> wrote:</div>
<br class="Apple-interchange-newline">
<div class="">
<div dir="ltr" style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">
<div class="gmail_quote">
<div dir="ltr" class="">On Fri, Jan 11, 2019 at 6:14 PM Balay, Satish via petsc-dev <<a href="mailto:petsc-dev@mcs.anl.gov" class="">petsc-dev@mcs.anl.gov</a>> wrote:<br class="">
</div>
<blockquote class="gmail_quote" style="margin: 0px 0px 0px 0.8ex; border-left-width: 1px; border-left-style: solid; border-left-color: rgb(204, 204, 204); padding-left: 1ex;">
Currently I see:<br class="">
<br class="">
balay@sb /home/balay/petsc (master=)<br class="">
$ gitreadytomerge<br class="">
origin/balay/metis-add-doubleprecision-option/maint<br class="">
origin/barry/feature-dmda1d-periodic-fill<br class="">
origin/Fande-Kong/fixed_hierarchical_partitioning_weights_master<br class="">
origin/haplav/feature-hdf5-improve-attribute-io<br class="">
origin/hzhang/fix-submats-memleak/maint<br class="">
origin/maint<br class="">
origin/next<br class="">
origin/psanan/dmstag-ex4-fix<br class="">
origin/rmills/fix-ex12-runtype-option/maint<br class="">
balay@sb /home/balay/petsc (master=)<br class="">
$ gitreadytomergeincomplete<span class="Apple-converted-space"> </span><br class="">
origin/balay/metis-add-doubleprecision-option/maint<br class="">
origin/barry/feature-dmda1d-periodic-fill<br class="">
origin/Fande-Kong/fixed_hierarchical_partitioning_weights_master<br class="">
origin/haplav/feature-hdf5-improve-attribute-io<br class="">
origin/hzhang/fix-submats-memleak/maint<br class="">
origin/knepley/fix-plex-interpolation-parallel<br class="">
origin/next<br class="">
origin/psanan/dmstag-ex4-fix<br class="">
origin/rmills/fix-ex12-runtype-option/maint<br class="">
<br class="">
So the extra branch in 'incomplete' list is origin/knepley/fix-plex-interpolation-parallel<br class="">
<br class="">
But then - next has:<br class="">
<br class="">
>>>>><br class="">
commit 216eaf983554edc1ad429265718576c68c47b72c<br class="">
Author: Karl Rupp <<a href="mailto:me@karlrupp.net" target="_blank" class="">me@karlrupp.net</a>><br class="">
Date: Wed Oct 3 07:19:27 2018 +0200<br class="">
<br class="">
Revert "Merge branch 'knepley/fix-plex-interpolation-parallel' into next [PR #1130]"<br class="">
<br class="">
This reverts commit 626808e7b5e6d32fe8ac4d345872231b9c5782ff, reversing<br class="">
changes made to 02a379f6432ba4e531280ac582edfd94c6a600ec.<br class="">
<<<<<<br class="">
<br class="">
So I'll ignore this branch.. I also see 'declined' on the PR.<br class="">
<a href="https://bitbucket.org/petsc/petsc/pull-requests/1130/knepley-fix-plex-interpolation-parallel/diff" rel="noreferrer" target="_blank" class="">https://bitbucket.org/petsc/petsc/pull-requests/1130/knepley-fix-plex-interpolation-parallel/diff</a></blockquote>
<div class=""><br class="">
</div>
<div class="">Yep, this needs a fix that I have to figure out. I should have time before the semester starts.</div>
</div>
</div>
</div>
</blockquote>
<div><br class="">
</div>
<div>Matt, be aware that this branch is obsolete. I think it can be deleted. The one that needs to be finished is</div>
<div><a href="https://bitbucket.org/petsc/petsc/branch/knepley/fix-plex-interpolate-sf" class="">https://bitbucket.org/petsc/petsc/branch/knepley/fix-plex-interpolate-sf</a></div>
<div><br class="">
</div>
<div>Thanks</div>
<div>Vaclav</div>
<br class="">
<blockquote type="cite" class="">
<div class="">
<div dir="ltr" style="caret-color: rgb(0, 0, 0); font-family: Menlo-Regular; font-size: 12px; font-style: normal; font-variant-caps: normal; font-weight: normal; letter-spacing: normal; text-align: start; text-indent: 0px; text-transform: none; white-space: normal; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration: none;" class="">
<div class="gmail_quote">
<div class=""><br class="">
</div>
<div class=""> Thanks,</div>
<div class=""><br class="">
</div>
<div class=""> Matt</div>
<div class=""> </div>
<blockquote class="gmail_quote" style="margin: 0px 0px 0px 0.8ex; border-left-width: 1px; border-left-style: solid; border-left-color: rgb(204, 204, 204); padding-left: 1ex;">
<br class="">
Satish<br class="">
<br class="">
On Fri, 11 Jan 2019, Balay, Satish via petsc-dev wrote:<br class="">
<br class="">
> I use the following:<br class="">
><span class="Apple-converted-space"> </span><br class="">
> alias gitreadytomerge'=git fetch -p && comm -12 <(git branch -r --merged origin/next | sort) <(git branch -r --no-merged origin/master | sort)'<br class="">
> alias gitreadytomergesorted='git fetch && paste <(gitreadytomerge | xargs git show -q --format=format:%aI) <(gitreadytomerge) |sort -n'<br class="">
> alias gitreadytomergeincomplete='git fetch -p && (for i in $(git log origin/master..origin/next --no-merges --format=%H); do git branch -r --contains $i; done | sort | uniq)'<br class="">
><span class="Apple-converted-space"> </span><br class="">
> The last one can take a while to process all the commits in next.<br class="">
><span class="Apple-converted-space"> </span><br class="">
> Note: they have some corner cases - like listing branches added to next<br class="">
> - and subsequently removed. [or if branch-A is merged to branch-B<br class="">
> and branch-B is merged to next - then branch-A is also listed etc..]<br class="">
><span class="Apple-converted-space"> </span><br class="">
> Satish<br class="">
><span class="Apple-converted-space"> </span><br class="">
><span class="Apple-converted-space"> </span><br class="">
> On Fri, 11 Jan 2019, Smith, Barry F. via petsc-dev wrote:<br class="">
><span class="Apple-converted-space"> </span><br class="">
> ><span class="Apple-converted-space"> </span><br class="">
> > Jed gave me this git script to find branches in next that have not yet been merged to master<br class="">
> ><span class="Apple-converted-space"> </span><br class="">
> > alias gitmasternotupdated="comm -12 <(git branch -r --merged origin/next | grep origin/ | sort) <(git branch -r --no-merged origin/master ) | xargs -n1 git log -1 --format='%Cgreen%ci %C(yellow)%d%Creset %s' --abbrev-commit | sed 's?origin/[a-z/-]*, ??g'
| grep -v '(origin/next)' | cut -b 1-`stty size | cut -d" " -f 2` | sort -u | grep -v Merge"<span class="Apple-converted-space"> </span><br class="">
> ><span class="Apple-converted-space"> </span><br class="">
> > Unfortunately it does not list branches in next that have had additional commits added to them (by someone fixing problems seen in nightly tests) since they were merged to next. Hence they can be "lost" branches that we forget to merge into next again for
another round of testing.<br class="">
> ><span class="Apple-converted-space"> </span><br class="">
> > Could someone cook up a script that captures these branches? That is, it shows branches in next that are not master but have been updated since they were merged into next.<br class="">
> ><span class="Apple-converted-space"> </span><br class="">
> > Thanks<br class="">
> ><span class="Apple-converted-space"> </span><br class="">
> > Barry<br class="">
> > <span class="Apple-converted-space"> </span><br class="">
><span class="Apple-converted-space"> </span><br class="">
<br class="">
</blockquote>
</div>
<br clear="all" class="">
<div class=""><br class="">
</div>
--<span class="Apple-converted-space"> </span><br class="">
<div dir="ltr" class="gmail_signature">
<div dir="ltr" class="">
<div class="">
<div dir="ltr" class="">
<div class="">
<div dir="ltr" class="">
<div class="">What most experimenters take for granted before they begin their experiments is infinitely more interesting than any results to which their experiments lead.<br class="">
-- Norbert Wiener</div>
<div class=""><br class="">
</div>
<div class=""><a href="http://www.cse.buffalo.edu/~knepley/" target="_blank" class="">https://www.cse.buffalo.edu/~knepley/</a></div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</blockquote>
</div>
<br class="">
</body>
</html>