From: "Michael" <keybou...@gmail.com>: Saturday, September 12, 2015 12:31 AM
On 2015-09-11, at 12:43 AM, Philip Oakley <philipoak...@iee.org> wrote:
From: "Philip Oakley" <philipoak...@iee.org>
From: "Michael" <keybou...@gmail.com>
I don't understand this last statement. Perhaps a graph showing the arrangement may help de-confuse which are 'off of' and which are 'on to'.


Sure; how to generate that graph?

You can also use 'git show-branch' etc with limiting of the number of commits to show to get a vertical flow, as long as the sequence isn't too deep, which may be reasonable in your case.
--
Philip

Ok

I think you needed to check the manual and it's example first for the best invocation ;-)

IIRC you only mentioned RebaseSimpleMerge and RemoveDebugSpam branches, so you'd put them on the command line, adding more branches until you have sufficient to show just what you need.


With no parameters, (IIUC) you have implied _all_ those branches shown ("all refs under refs/heads and/or refs/tags"), which wasn't what you needed.

The first block lists a "!" column marker then the branch name for that column.
The current branch uses "*", so you are on  "throw-away".


! [CofhFix] Run our Block table change after CofhCore (override them). Fixes compatibility with CofhCore / Redstone Flux / RfTools.
! [CommandToToggleFlow] Merge branch 'WhyDoesItCrashP' into throw-away
 ! [FixThreadAllocation] Fix a bug in allocating worker threads
! [RebaseSimpleMerge] Run our Block table change after CofhCore (override them). Fixes compatibility with CofhCore / Redstone Flux / RfTools. ! [RemoveDebugSpam] First step in rebuilding the released source -- remove debug spam ! [Reparent] See if reparenting the liquid class solves compatibility with streams, etc ! [Trial-Merge] Merge branch 'WhyDoesItCrashP' into Trial-Merge Primary: Debugging printfs (shows in launcher log) ! [WhyDoesItCrashP] Fix to debugging data, flag first run properly ! [master] Update mcmod.info. Remove it from bin/ as that's an output. ! [simple_pressure] More scheduling adjustments - Some aspects of scheduling CAN FREEZE THE SERVER ATM
         * [throw-away] Merge branch 'WhyDoesItCrashP' into throw-away
! [origin/Cofh] Bin/mcmod.info should NOT be in git. It is generated during build.
           ! [origin/HEAD] Conflict fix for gitignore
! [origin/IntegrationTest] Merge branch 'FixThreadAllocation' into IntegrationTest
             ! [origin/master] Conflict fix for gitignore
! [origin/pressure] Pressure works now, but lags in deep oceans ! [origin/simple_pressure] More scheduling adjustments - Some aspects of scheduling CAN FREEZE THE SERVER ATM ! [origin/throw-away] Merge branch 'WhyDoesItCrashP' into throw-away
------------------

Here we see the commit trail. Newest first.
The first commit shows a "-" (a merge) under the above "* [throw-away]" column; sort of what you'd expect

- [Trial-Merge] Merge branch 'WhyDoesItCrashP' into Trial-Merge Primary: Debugging printfs (shows in launcher log) + + + [CofhFix] Run our Block table change after CofhCore (override them). Fixes compatibility with CofhCore / Redstone Flux / RfTools.

IIUC, here are the three + marks for merge, then the (?first parent) branch name.


+ + + + [master] Update mcmod.info. Remove it from bin/ as that's an output. + + + + [master^] Srg/Mcp conf files are needed in the eclipse environment - - - [CommandToToggleFlow] Merge branch 'WhyDoesItCrashP' into throw-away + ++ * + [WhyDoesItCrashP] Fix to debugging data, flag first run properly
+        *      + [CommandToToggleFlow^] missed a line in the merge
- - - [CommandToToggleFlow~2] Merge branch 'IntegrationTest' into throw-away - - - - [origin/IntegrationTest] Merge branch 'FixThreadAllocation' into IntegrationTest ++ + * + + [FixThreadAllocation] Fix a bug in allocating worker threads - - - [CommandToToggleFlow~3] Merge branch 'whydoesitcrashp' into throw-away + ++ * + [WhyDoesItCrashP^] More debugging. This makes no sense -- it is not adding enough threads, and the scheduling is a mess - - - [CommandToToggleFlow~4] Merge branch 'WhyDoesItCrashP' into throw-away
+    ++  *      + [WhyDoesItCrashP~2] Track the thread size
+ ++ * + [WhyDoesItCrashP~3] 1. Debugging statements to add to integration test. 2. "Uncommented", and re-formatted, one of the rain/evaporation routines. -- That needs to go into master, but it requires adding getters/setters to the parent FiniteFluid block. Which are needed. - - - - [CommandToToggleFlow~5] Merge branch 'reparent' into IntegrationTest + ++ * + + [Reparent] See if reparenting the liquid class solves compatibility with streams, etc
++++ ++++ * +++  + [origin/HEAD] Conflict fix for gitignore
- - - - [CommandToToggleFlow~6] Merge branch 'ReplicateRelease' into integrationTest + + + * + + [RemoveDebugSpam] First step in rebuilding the released source -- remove debug spam + *+ + + [origin/Cofh] Bin/mcmod.info should NOT be in git. It is generated during build. + *+ + + [origin/Cofh^] Launch configurations needs to be tracked. Core mods need an fml flag to work in eclipse.
+        *+ +   + [origin/Cofh~2] Fix should be just the sort order
+        *+ +   + [origin/Cofh~3] updating to 1492
+++++++++ *++++ + [origin/HEAD^] Need one more file ignored for Eclipse.


The "pressure" and "simple pressure" branches were removed; nothing in them is relevant to this so far.

(If you can't make heads or tails out of that, look at https://keybou...@bitbucket.org/keybounce/minecraft-finite-fluids.git)

The https://bitbucket.org/keybounce/minecraft-finite-fluids/commits/all appears to give a reasonable display of the current flow if that helps you.

Personally I avoid too many merge commits (especially those that happen because of non-ff pull's) because they can mix up different lines of development.


Let's get back to "what was the oringinal problem, eh" We could be getting into an XY-Problem scenario...
http://meta.stackexchange.com/questions/66377/what-is-the-xy-problem
http://xyproblem.info/
--
You received this message because you are subscribed to the Google Groups "Git for 
human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to