[petsc-dev] PETSc developers who use weird MPI

Jed Brown jedbrown at mcs.anl.gov
Sat Nov 2 14:52:15 CDT 2013

Peter Brune <prbrune at gmail.com> writes:
>  Jed mistakes prbrune/sf-sfbasicops with prbrune/snes-qnscaling, which was
> unrelated and my bad.  It came to the fore because it made clearing up
> someone merging next into a branch even nastier.  I'm pretty sure that I
> didn't rebase sf-sfbasicops or mat-matcolor after merging them to next, so
> these things shouldn't exist.

You rebased this commit, which is part of prbrune/sf-sfbasicops:

$ diff -u  <(git show --format=fuller 53deab3) <(git show --format=fuller a49f225)                                                            
--- /dev/fd/63  2013-11-02 13:40:30.964494674 -0600
+++ /dev/fd/62  2013-11-02 13:40:30.964494674 -0600
@@ -1,8 +1,8 @@
-commit 53deab39b05c95f82ded0f9b5ed98e1eca77ec57
+commit a49f225f21e5e022456a96fbd0a3a873045b2c5d
 Author:     Peter Brune <brune at mcs.anl.gov>
 AuthorDate: Wed Oct 9 14:54:51 2013 -0500
 Commit:     Peter Brune <brune at mcs.anl.gov>
-CommitDate: Wed Oct 9 14:54:51 2013 -0500
+CommitDate: Thu Oct 17 13:38:04 2013 -0500
     Added several additional MPI_Ops to PetscSFBasic.

> The issue is that prbrune/mat-matcolor didn't get your update to
> prbrune/sf-sfbasicops, and Barry merged the prior without the updated
> latter.  I had merged prbrune/sf-sfbasicops into prbrune/mat-matcolor
> because I wrote it *specifically* so that I could do things in
> prbrune/mat-matcolor.  I had not realized that Satish had updated it and
> did not remerge, 

You merged Satish's changes here:

commit 8e99f7ed935331a914b25fa0bb6ec261cd675366
Merge: a49f225 f3fe83a
Author: Peter Brune <brune at mcs.anl.gov>
Date:   Fri Nov 1 21:34:12 2013 -0500

    Merge branch 'prbrune/sf-sfbasicops' of bitbucket.org:petsc/petsc into prbrune/sf-sfbasicops

If someone else is committing on your branch, you should ask yourself
why and decide what to do.  If you have rebased your local version of
the branch and want everything to be rebased, you need to
rebase/cherry-pick their commits.  If you committed locally, it's
usually better to rebase your changes on top of their bug-fix (perhaps
squashing their bug-fix wherever it belongs---if nobody depends on any
of those commits yet).

> so barry got the old copy when merging mat-matcolor in.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 835 bytes
Desc: not available
URL: <http://lists.mcs.anl.gov/pipermail/petsc-dev/attachments/20131102/bdd222b3/attachment.sig>

More information about the petsc-dev mailing list