Add support for merge-friendly branches
authorCatalin Marinas <catalin.marinas@gmail.com>
Sat, 30 May 2009 12:13:25 +0000 (13:13 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Sat, 30 May 2009 12:13:25 +0000 (13:13 +0100)
commite58f264a3e59a0887c7aaa1e3227cff108ac840d
tree821be5eaa2c0c3552f3354e1f1d515b20ad7bb2b
parentba6208ec9f272605607d53db6ea2942b246819e6
Add support for merge-friendly branches

The main issue with publishing StGit branches is that the Git history
represented by patches is volatile, making it difficult for people
wanting to merge such branch. One solution is for all the downstream
developers to always rebase but that's not always desirable. Another
solution is provided by tools like TopGit but the visible Git history
becomes complicated, especially with repeated reordering.

The patch proposes a new StGit command called "publish". This command
allows one to develop patches normally on a StGit branch but publish the
stack changes to a separate, merge-friendly branch whose history is not
re-writable.

More about its behaviour can be found in the command description in this
patch.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/common.py
stgit/commands/new.py
stgit/commands/publish.py [new file with mode: 0644]
stgit/lib/git.py
t/t4100-publish.sh [new file with mode: 0755]