semvec/pypi-packages huggingface dataset:
psykorebase 1.0.1
Easily perform safe (merge-based) rebases.
License: BSD
Keywords: git merge rebase

###########
psykorebase
###########

Easily perform merge-based rebases, i.e. rebases that don't alter history.

You can read the full rationale behind this idea here:

* http://tech.novapost.fr/merging-the-right-way-en.html
* http://tech.novapost.fr/psycho-rebasing-en.html


*****
What?
*****

As a summary:

* ``git checkout topic && git merge master`` is the wrong way to merge.
  Get ready for bad things to happen.

* ``git checkout topic && git rebase master`` is better but:

  * it alters history. It is safe from merge conflicts but doesn't guarantee
    that merged code works. You are losing some intermediate states of your
    work.

  * it is incompatible with branches you already pushed to shared repository.

``psykorebase``:

* mimics the "rebase" workflow, but only using merges, no history alteration.
  It replays "topic" changes on top of "master" in "topic" branch (just like
  rebase), without deleting "topic" changes.

* preserves all states of your code.

* is compatible with pushed branches.

* the main (and only?) counterpart is that there are more entries in history.
  There are more commits and more merges. Is that a drawback? If you look
  carefully, things are clear and clean. But some developers don't like it...


*******
Install
*******

Currently developped against Python 2.7.x.
Supports only Git for now.

.. code-block:: sh

   sudo pip install https://github.com/benoitbryon/psykorebase/archive/master.tar.gz#egg=psykorebase

Uninstall with ``sudo pip uninstall psykorebase``.


*****
Usage
*****

Git
===

Current, in-development prototype
---------------------------------

``psykorebase MASTER [TOPIC]`` performs a "psycho-rebase" of TOPIC branch on
top of MASTER. Where TOPIC is optional and defaults to current branch.

Example:

.. code-block:: sh

   git checkout master && git pull --rebase origin master  # Update master.
   git checkout topic && psykorebase master  # Psykorebase topic on top of master.

Planned usage (in development)
------------------------------

The default, issues one merge for each (new) commit in topic branch:

``git checkout topic && psykorebase master``.

The quick'n'dirty, issues one big merge which includes all (new) commits from
topic branch (merges heads):

``git checkout topic && psykorebase --fast master``

The default is safer, the ``--fast`` works well when there are poor chances of
problems.
CHANGELOG
=========

1.0.1 (2015-07-29)
==================

- Fix setup.py


1.0.0 (2015-07-29)
==================

- Add Python3 support.
- Add Git support
- Add ``psykorebase BRANCH`` and ``psykorebase --continue`` functionality.
vumi-message-store 0.1.4
A persistent store for vumi messages.
License: BSD

Vumi Message Store
==================

A persistent store for vumi messages.

(This has been extracted from the core vumi repository.)

.. _Vumi: http://github.com/praekelt/vumi

|message-store-ci|_ |message-store-cover|_

.. |message-store-ci| image:: https://travis-ci.org/praekelt/vumi-message-store.png?branch=develop
.. _message-store-ci: https://travis-ci.org/praekelt/vumi-message-store

.. |message-store-cover| image:: https://coveralls.io/repos/praekelt/vumi-message-store/badge.png?branch=develop
.. _message-store-cover: https://coveralls.io/r/praekelt/vumi-message-store

You can contact the Vumi development team in the following ways:

* via *email* by joining the the `vumi-dev@googlegroups.com`_ mailing list
* on *irc* in *#vumi* on the `Freenode IRC network`_

.. _vumi-dev@googlegroups.com: https://groups.google.com/forum/?fromgroups#!forum/vumi-dev
.. _Freenode IRC network: https://webchat.freenode.net/?channels=#vumi

Issues can be filed in the GitHub issue tracker. Please don't use the issue
tracker for general support queries.