I've rebased my experimental branch against the stuff Catalin pushed
out recently. The remaining diff is mostly the DAG series and David's
push conflict improvements. I haven't had time to test drive it
thoroughly, but it passes the test suite.
The following changes since commit 7e97cc0590f29482af022340df84a43b98c657ce:
Yann Dirson (1):
Include contrib scripts in the release tarball.
are available in the git repository at:
git://repo.or.cz/stgit/kha.git master
David Kågedal (5):
Split git.merge into two functions
Leave working dir and index alone after failed (conflicting) push
Added a test case to check what happens when push finds a conflict
Simplify merge_recursive
Use the output from merge-recursive to list conflicts
Karl Hasselström (12):
Compute patch appliedness from commit DAG
Test the new DAG appliedness machinery
Fix bash completion after the DAG appliedness patch
Speed up the appliedness test
Speed up the discovery of uninteresting commits
Speed up appliedness check during patch creation
Don't traverse the whole DAG when looking for uninteresting commits
Find uninteresting commits faster for special cases
Optimize uninterestingness checks for rebase
Don't touch ref files manually
Merge branch 'refs'
Merge branch 'conflict'
contrib/stgit-completion.bash | 15 +-
stgit/commands/branch.py | 5 +-
stgit/commands/commit.py | 8 +-
stgit/commands/common.py | 4 +-
stgit/commands/float.py | 2 +-
stgit/commands/imprt.py | 2 +-
stgit/commands/pick.py | 2 +-
stgit/commands/refresh.py | 2 +-
stgit/commands/sync.py | 2 +-
stgit/git.py | 140 ++++++----
stgit/stack.py | 642 ++++++++++++++++++++++++++++++++---------
t/t0001-subdir-branches.sh | 7 +-
t/t1000-branch-create.sh | 30 +--
t/t1001-branch-rename.sh | 2 +-
t/t1203-push-conflict.sh | 64 ++++
t/t3000-git-interop.sh | 60 ++++
t/t4000-upgrade.sh | 6 +
17 files changed, 741 insertions(+), 252 deletions(-)
create mode 100755 t/t1203-push-conflict.sh
create mode 100755 t/t3000-git-interop.sh
--
Karl Hasselström, kha@xxxxxxxxxxx
www.treskal.com/kalle
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
