M

pemis.log

maksenov@supki-laptop:~/git/biegunka% g log -10 --oneline origin/develop
dbdec92 7.6.2 (?) bug fix.
1b096de Rewrite 'check' interpreter.
4aa1c23 Add a bit of doctests.
89b1006 Fix specs.
504c900 Update biegunka init template
c9f230f Cleverer TH.
6a3e4de Remove Mode.
8001860 Work with directories as path for `biegunka init`.
c80072a Swap retries/reacting in docs.
438d200 Haddock parsing fixes.
maksenov@supki-laptop:~/git/biegunka% g log -10 --oneline
11c5e27 Merge branch 'feature-sophisticated-destination-type' into develop
b010b8a More robust ownership check.
67d522d Add spec.
6e69382 Naming.
1b096de Rewrite 'check' interpreter.
4aa1c23 Add a bit of doctests.
89b1006 Fix specs.
504c900 Update biegunka init template
c9f230f Cleverer TH.
6a3e4de Remove Mode
maksenov@supki-laptop:~/git/biegunka% g rebase origin develop
First, rewinding head to replay your work on top of it...
Applying: Update README.md
Applying: Experimental (==>)
Applying: Return git_.
Applying: Added defaultGit.
Applying: INLINE
Applying: Separated language primitives in Biegunka.Primitive.
Applying: Moved to ansl-wl-pprint.
Applying: Moved to terminal-size.
Applying: Switch arguments order in biegunka.
Applying: Update README.md
Applying: Remove unsafe bits.
Applying: Dead code.
Applying: Extract STM part of EE into separate datatype.
Applying: ...
Applying: Broken terminal ioctl should not kill logger.
Applying: Simplify spec.
Applying: Moved to terminal-size 0.2.0.0
Applying: Implicit filename append.
Applying: Update README.md
Applying: Don't log empty messages.
Applying: Restore unupdated source status on exception.
Applying: Annotate DSL.
Applying: Ignore annotations in Biegunka.Transform for now.
Applying: Extract Script in separate module.
Applying: Script should be opaque "Monad" to user.
Applying: Richer Script state.
Applying: Cosmetics.
Applying: Absorb filepath mangling from .Transform.
Applying: Added sourced.
Applying: Added actioned.
Applying: Update source before annotating actions script.
Applying: Implicit filename append.
Applying: Move Execute onto Free EL.
Applying: Thread annotation type through GADT.
Applying: Fork before Sources command finishes execution.
Applying: Move Verify onto Free.
Applying: Cosmetics.
Applying: Load saved data from EL.
Applying: Cosmetics.
Applying: Construct new data from EL.
Applying: Move Pretend onto EL.
Applying: Remove Biegunka.Transform.
Applying: Remove IL.
Applying: Cosmetics.
Applying: Finally descriptive names.
Applying: Wrapper is actually Modifier.
Applying: Disambiguate execution state control.
Applying: Restore unupdated source status on exception.
Applying: Annotate Actions with profile identifier.
Applying: Annotate Actions with order.
Applying: Annotate Actions with maximum order.
Applying: Support chained commands.
Applying: Separate module for scheduler.
Applying: Typed EE.
Applying: More polymorphism in EE.
Applying: Add DSL spec stub.
Applying: Test chained DSL primitives.
Applying: Test mangled paths.
Applying: Rename (~>>) to (<~>).
Applying: App stub.
Applying: Make biegunka init template.
Applying: Add Paths module stub.
Applying: Copy template to current directory in biegunka init.
Applying: Warn on existing biegunka script.
Applying: Move biegunka template initialization under init subcommand.
Applying: Add confirm interpreter.
Applying: Use confirm in init template.
Applying: More structure to init template.
Applying: Autogenerate an option parser capturing environments. #48
Applying: mempty is a "do nothing" interpreter.
Applying: Support interpretation flags too. #48
Applying: More documentation in init template.
Applying: Cosmetics.
Applying: Init script in Dotfiles.hs.
Applying: Incremental interpreters flags.
Applying: Cosmetics.
Applying: Always print forecast, then stats.
Applying: Do not use pipes.
Applying: Minor.
Applying: Support run command.
Applying: Ignore cabal sandboxes.
Applying: A bit of kludges to support building on GHC 7.4.
Applying: More kludges.
Applying: More kludges.
Applying: Split --run into smaller commands.
Applying: Wait for both stdout and stderr to close.
Applying: Support all possible run variants.
Applying: Do not treat empty input as No in prompts.
Applying: Also support --full
Applying: Trying to be clever about possible sandboxes user want to -package-db around here.
Applying: Support running custom biegunka script.
Applying: Move from cabal-dev to cabal sandboxes.
Applying: More haddocks.
Applying: Renamed interpreters for consistency.
Applying: Explicit --safe for completeness.
Applying: Somewhat more descriptive --help.
Applying: Fix tests compilation.
Applying: Fix makeOptionsParser haddocks.
Applying: Not much sense to give emphasis to "n" then
Applying: Reorganize repository.
Applying: Fix spec.
Applying: Ok, really fix spec.
Applying: Add nested profiles spec test.
Applying: Add .rspec.
Applying: Update Actions primitives haddocks.
Applying: Rename registerAt to register.
Applying: Unify semantics of TH options parser and biegunka tool.
Applying: Expand on profile docs.
Applying: Make sure DSL does not mangle absolute paths.
Applying: Make dropPriviledges a separate function.
Applying: Support both command specs.
Applying: Rename command to raw.
Applying: Haddock fixes.
Applying: Better naming for EL.
Applying: Better naming for SA.
Applying: Better naming for SS.
Applying: Cosmetics.
Applying: peek is copoint.
Applying: Cosmetics.
Applying: Better naming for liftS.
Applying: Add a bit of specs.
Applying: Merge Pretend and Execute. #51
Applying: Useless cocosmetics.
Applying: Better naming for S/P/A/M.
Applying: Useless cocosmetics.
Applying: Better naming for Shell.
Applying: Some typecheck tests explanations.
Applying: Support colorchemes. #46
Applying: Remove outdated info from README.
Applying: Different sandboxes are mutually exclusive.
Applying: Cosmetics.
Applying: Check STDERR in failing compilation tests.
Applying: Fix inverted controls.
Applying: Better naming for Execution.
Applying: Better naming for Controls.
Applying: Haddocks.
Applying: Better naming for EC.
Applying: s/Controls/Settings/
Applying: Better naming for STM.
Applying: Better naming for EE.
Applying: Safer exectuon settings.
Applying: Better naming for Globals.
Applying: 100% Haddocks.
Applying: s/exec/run/
Applying: Drop is sane default for Priviledges.
Applying: Move stuff around.
Applying: Execution <-> Run
Applying: Minor.
Applying: ~ is sensible default for root.
Applying: Make profiles/groups purely syntactic thing.
Applying: Cosmetics.
Applying: Make it possible to have both "a/b" and "a" profiles working.
Applying: Check stuff in all mentioned profiles.
Applying: Since I'm breaking compatibility stuff, might as well fix app data directory structure.
Applying: Better namings for DB and R.
Applying: Remove profile records if profiles are empty in script.
Applying: Haddock fixes.
Applying: Fix specs.
Applying: Add nest spec test.
Applying: Test profile data file generation/deletion in behaviours tests.
Applying: Fix chaining: it's possible to chain any group of tasks.
Applying: Add simpler testing Source type.
Applying: Better naming for dummy.
Applying: Fix tests.
Applying: Better naming for chain.
Applying: Update biegunka script template.
Applying: Minor polymorphism stuff.
Applying: Replace wordy explanation of constructDestinationFilepath with examples.
Applying: Better naming for construct.
Applying: Test nested profiles construction mechanisms equality.
Applying: Fix mentioned profiles accounting.
Applying: Add chaining spec.
Applying: Add interpreters composition spec.
Applying: Add TH spec.
Applying: Initial patch primitives.
Applying: Approximate dependencies boundaries.
Applying: Random cosmetics.
Applying: Ditch custom kludges for exceptions.
Applying: Patch verification.
Applying: Naive patch application in Execute.
Using index info to reconstruct a base tree...
M       biegunka-core.cabal
M       lib/Biegunka/Execute.hs
Falling back to patching base and 3-way merge...
Auto-merging lib/Biegunka/Execute.hs
Auto-merging biegunka-core.cabal
CONFLICT (content): Merge conflict in biegunka-core.cabal
Recorded preimage for 'biegunka-core.cabal'
Failed to merge in the changes.
Patch failed at 0180 Naive patch application in Execute.
The copy of the patch that failed is found in:
   /home/maksenov/git/biegunka/.git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".