<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, May 25, 2016 at 11:31 AM, Satish Balay <span dir="ltr"><<a href="mailto:balay@mcs.anl.gov" target="_blank">balay@mcs.anl.gov</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Mark,<br>
<br>
To simplify - lets start over..<br>
<br>
- you delete your copy of mark/snes-ex56c, jed/mark/snes-ex56c<br>
<br>
i.e:<br>
git rebase --abort<br>
git reset --hard<br>
git checkout master<br>
git branch -D mark/snes-ex56c jed/mark/snes-ex56c<br></blockquote><div><br></div><div>done</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
- Then I'll push to 'mark/snes-ex56c' [delete jed/mark/snes-ex56c on server]<br>
<br>
- After I do my changes - you can start using mark/snes-ex56c<br>
<div class="HOEnZb"><div class="h5"><br>
Satish<br>
<br>
On Wed, 25 May 2016, Mark Adams wrote:<br>
<br>
> On Wed, May 25, 2016 at 11:14 AM, Satish Balay <<a href="mailto:balay@mcs.anl.gov">balay@mcs.anl.gov</a>> wrote:<br>
><br>
> > This is hopeless..<br>
> ><br>
> > Did you reset your 'mark/snes-ex56c' again to the old stuff?<br>
> ><br>
> > I don't get any merge conflicts - If I start from Jed's rebased/branch<br>
> > commit f2cb8422898d35ef96e146caa3a95b2f879b25f1<br>
> ><br>
><br>
> I did this from the non-jed version.<br>
><br>
><br>
> ><br>
> > balay@asterix /home/balay/petsc (master=)<br>
> > $ git co -b test f2cb8422898d35ef96e146caa3a95b2f879b25f1<br>
> > Switched to a new branch 'test'<br>
> > balay@asterix /home/balay/petsc (test)<br>
> > $ git rebase -i master<br>
> > Successfully rebased and updated refs/heads/test.<br>
> ><br>
> ><br>
> Maybe I corrupted jed's branch. I now get a different error. This rebase<br>
> pulled up a vi window and I replaced "pick" with "s" for commits that I<br>
> want to squash.<br>
><br>
> 11:15 jed/mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git<br>
> rebase -i master<br>
> The previous cherry-pick is now empty, possibly due to conflict resolution.<br>
> If you wish to commit it anyway, use:<br>
><br>
> git commit --allow-empty<br>
><br>
> Otherwise, please use 'git reset'<br>
> interactive rebase in progress; onto 9c9a9c5<br>
> Last commands done (93 commands done):<br>
> pick 5a3406a added ex56 in snes, 3D linear elasticity using Plex on a<br>
> cube<br>
> pick 95a678b DMP4est: fix coarseEdge calculation in transfer_Point<br>
> Next commands to do (102 remaining commands):<br>
> pick 013797a Need to declare TSSSPList as PETSC_EXTERN so users can add<br>
> to the list<br>
> pick f92a85d Latest boost release seems to handle shared libraries on<br>
> Mac properly so remove error message<br>
> You are currently rebasing branch 'jed/mark/snes-ex56c' on '9c9a9c5'.<br>
><br>
> Untracked files:<br>
> ShockTube_Dx_converg.png<br>
> mhdforest.aux<br>
> mhdforest.pdf<br>
> mhdforest.tex<br>
> out<br>
> out_alltest_ex56<br>
> out_alltest_next<br>
> src/dm/examples/tutorials/dmda-mpiio.pbvec<br>
> src/dm/examples/tutorials/dmda.pbvec<br>
> src/dm/examples/tutorials/gauss.h5<br>
> src/dm/examples/tutorials/hdf5output.h5<br>
> src/dm/impls/picell/<br>
> src/ksp/ksp/examples/tutorials/.petscrc<br>
> src/ksp/ksp/examples/tutorials/ex34_1.tmp<br>
> src/ksp/ksp/examples/tutorials/ex34_2.tmp<br>
> src/mat/examples/tests/ex191matrix<br>
> src/mat/examples/tests/fort.7<br>
> src/snes/examples/tests/base_module.mod<br>
> src/snes/examples/tests/ex1f_2.tmp<br>
> src/snes/examples/tests/extended_module.mod<br>
> src/snes/examples/tests/function_module.mod<br>
> src/snes/examples/tutorials/.petscrc<br>
> src/snes/examples/tutorials/f90module.mod<br>
> src/snes/examples/tutorials/f90moduleinterfaces.mod<br>
> src/snes/examples/tutorials/petsc_kkt_solver.mod<br>
> src/snes/examples/tutorials/petsc_kkt_solver_interfaces.mod<br>
> src/sys/examples/tutorials/bag_data_module.mod<br>
> src/sys/examples/tutorials/bag_interface_module.mod<br>
> src/sys/examples/tutorials/binaryoutput<br>
> src/sys/logging/examples/tutorials/filename.xml<br>
> src/ts/examples/tutorials/SA-data/<br>
> src/ts/examples/tutorials/advection-diffusion-reaction/SA-data/<br>
> src/ts/examples/tutorials/petscshiftmod.mod<br>
> src/ts/examples/tutorials/power_grid/SA-data/<br>
> src/ts/examples/tutorials/power_grid/stability_9bus/SA-data/<br>
> src/ts/examples/tutorials/power_grid/stability_9bus/out.bin<br>
> src/vec/is/examples/tests/testfile<br>
> src/vec/vec/examples/tests/ex29_bts_2_subset.tmp<br>
> src/vec/vec/examples/tests/x.h5<br>
> src/vec/vec/examples/tests/xH.pbvec<br>
> src/vec/vec/examples/tests/xHmpi.pbvec<br>
> src/vec/vec/examples/tutorials/mymodule.mod<br>
><br>
> nothing added to commit but untracked files present<br>
> Could not apply 95a678b879f0666d009cbaa65ec66f87451d4d65... DMP4est: fix<br>
> coarseEdge calculation in transfer_Point<br>
> 11:19 1 jed/mark/snes-ex56c|REBASE-i 93/195<br>
> ~/Codes/petsc/src/snes/examples/tutorials$<br>
><br>
><br>
><br>
><br>
> > <after a editor prompt with the following commits - for interactive rebase><br>
> > pick 849c9e8 changed Cheby random to noisy<br>
> > pick ee4626e added snes ex56, Plex with 3D linear elasticity<br>
> > pick b79c9a7 added ex56 in snes, 3D linear elasticity using Plex on a cube<br>
> > pick a64eebe clean up cheby fix<br>
> > pick 23c3567 small cleanup of noisy cheby<br>
> > pick cc7a30b fix ex56 init/fin error<br>
> > pick c34fc5a remove spaces<br>
> > pick 0008a30 fix complex build<br>
> > pick e78b637 updated test for new cheby<br>
> > pick 4acf97d fixed test for new cheby<br>
> > pick fdcaa90 merge makefile changed for ex56 and parmetis<br>
> > pick f2cb842 fixed bug in makefile<br>
> ><br>
> > Satish<br>
> ><br>
> ><br>
> > On Wed, 25 May 2016, Mark Adams wrote:<br>
> ><br>
> > > I do git rebase -i master, and I get a lot of these:<br>
> > ><br>
> > > 10:53 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ git<br>
> > > rebase -i master<br>
> > > error: could not apply 121daff... I am sick of finding examples that have<br>
> > > no test cases!<br>
> > ><br>
> > > When you have resolved this problem, run "git rebase --continue".<br>
> > > If you prefer to skip this patch, run "git rebase --skip" instead.<br>
> > > To check out the original branch and stop rebasing, run "git rebase<br>
> > > --abort".<br>
> > > Could not apply 121daff3befe8860e39d0d85f21fecb925e5e5cd... I am sick of<br>
> > > finding examples that have no test cases!<br>
> > ><br>
> > > I did this this morning and there were about 8 of these conflicts that I<br>
> > > had to fix manually. I wanted to check before I proceed. They were<br>
> > > straightforward fixes.<br>
> > ><br>
> > > Mark<br>
> > ><br>
> > ><br>
> > > On Wed, May 25, 2016 at 10:40 AM, Mark Adams <<a href="mailto:mfadams@lbl.gov">mfadams@lbl.gov</a>> wrote:<br>
> > ><br>
> > > ><br>
> > > ><br>
> > > > On Wed, May 25, 2016 at 10:18 AM, Satish Balay <<a href="mailto:balay@mcs.anl.gov">balay@mcs.anl.gov</a>><br>
> > wrote:<br>
> > > ><br>
> > > >> On Wed, 25 May 2016, Mark Adams wrote:<br>
> > > >><br>
> > > >> ><br>
> > > >> > 10:09 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$<br>
> > git<br>
> > > >> reset<br>
> > > >> > --hard f2cb8422898d35ef96e146caa3a95b2f879b25f1<br>
> > > >> > HEAD is now at f2cb842 fixed bug in makefile<br>
> > > >> ><br>
> > > >> > OK, now what?<br>
> > > >><br>
> > > >> 1. Verify that its feature complete as you expect [and not missing any<br>
> > > >> commits]?<br>
> > > >><br>
> > > >> gitk master..mark/snes-ex56c<br>
> > > >><br>
> > > ><br>
> > > > I got this error:<br>
> > > ><br>
> > > > 10:37 mark/snes-ex56c= ~/Codes/petsc/src/snes/examples/tutorials$ gitk<br>
> > > > master..mark/snes-ex56c<br>
> > > > Error in startup script: unknown color name "lime"<br>
> > > > (processing "-fore" option)<br>
> > > > invoked from within<br>
> > > > "$ctext tag conf m2 -fore [lindex $mergecolors 2]"<br>
> > > > (procedure "makewindow" line 347)<br>
> > > > invoked from within<br>
> > > > "makewindow"<br>
> > > > (file "/Users/markadams/homebrew/bin/gitk" line 12434)<br>
> > > ><br>
> > > ><br>
> > > ><br>
> > > >><br>
> > > >> 2. Update branch as needed [perhaps you were wanting to squash<br>
> > > >> commits? since you've mentioned 'rebase -i' previously?]<br>
> > > >><br>
> > > >><br>
> > > > git rebase -i<br>
> > > ><br>
> > > > or<br>
> > > ><br>
> > > > git rebase -i master<br>
> > > ><br>
> > > > ?<br>
> > > ><br>
> > > ><br>
> > > >> 3. verify and test locally?<br>
> > > >><br>
> > > >> 4. update 'mark/snes-ex56c' on server.<br>
> > > >><br>
> > > >> git push -f<br>
> > > >><br>
> > > >> 5. If feature complete - update pull request?<br>
> > > >><br>
> > > >> Satish<br>
> > > >><br>
> > > ><br>
> > > ><br>
> > ><br>
> ><br>
> ><br>
><br>
<br>
</div></div></blockquote></div><br></div></div>