From: "Karl Hasselström" <kha@treskal.com>
To: git@vger.kernel.org
Subject: StGit kha experimental branch updated
Date: Mon, 24 Sep 2007 02:10:34 +0200 [thread overview]
Message-ID: <20070924001034.GB24403@diana.vm.bytemark.co.uk> (raw)
In-Reply-To: <20070924000244.GA24403@diana.vm.bytemark.co.uk>
The three last patches of David's top/bottom removal series are here,
and all the old patches too. Changes:
* Everything's been rebased on top of David's top/bottom removal
series, which turned out to be a major undertaking. I'm not 100%
sure I've managed to not break anything.
* I've modified the conflict series to adhere to the new test suite
policy; it now passes the test suite at every point, by using
test_expect_failure for broken tests.
* The add/rm/cp removal patches no longer break "stg help".
The following changes since commit 5f594e90e9a0867e1b87ffb8b0a077152246b56c:
Karl Hasselström (1):
New policy: Only use test_expect_failure for broken tests
are available in the git repository at:
git://repo.or.cz/stgit/kha.git experimental
David Kågedal (9):
Check bottom and invariants
Remove the 'bottom' field
Remove the 'top' field
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
Ask git about unmerged files
Karl Hasselström (20):
Remove the --force flag to "stg rebase" and "stg pull"
Better error message if merge fails
Fix "stg resolved" to work with new conflict representation
Refactoring: pass more than one file to resolved()
We keep the different stages of a conflict in the index now
Clean up the logic in "stg resolved"
"stg status --reset" is not needed anymore
Remove "stg add"
Remove "stg rm"
Remove "stg cp"
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
Merge branch 'conflict' into experimental
Documentation/stg-cp.txt | 63 -----
Documentation/tutorial.txt | 22 +-
contrib/stgit-completion.bash | 15 +-
stgit/commands/add.py | 43 ---
stgit/commands/commit.py | 8 +-
stgit/commands/common.py | 34 +--
stgit/commands/copy.py | 44 ---
stgit/commands/float.py | 2 +-
stgit/commands/pick.py | 2 +-
stgit/commands/pull.py | 5 +-
stgit/commands/rebase.py | 5 +-
stgit/commands/resolved.py | 70 ++---
stgit/commands/rm.py | 47 ---
stgit/commands/status.py | 34 +--
stgit/commands/sync.py | 1 -
stgit/git.py | 72 +++--
stgit/gitmergeonefile.py | 99 ++++---
stgit/main.py | 6 -
stgit/run.py | 3 +
stgit/stack.py | 620 ++++++++++++++++++++++++++++++++---------
t/t0002-status.sh | 11 +-
t/t1200-push-modified.sh | 2 +-
t/t1202-push-undo.sh | 4 +-
t/t1203-push-conflict.sh | 70 +++++
t/t1300-uncommit.sh | 4 +-
t/t1301-assimilate.sh | 2 +-
t/t1400-patch-history.sh | 4 +-
t/t1500-float.sh | 14 +-
t/t1600-delete-one.sh | 12 +-
t/t1601-delete-many.sh | 2 +-
t/t1700-goto-top.sh | 2 +-
t/t2000-sync.sh | 8 +-
t/t2100-pull-policy-fetch.sh | 18 +-
t/t2101-pull-policy-pull.sh | 4 +-
t/t2102-pull-policy-rebase.sh | 28 +--
t/t3000-git-interop.sh | 60 ++++
t/t4000-upgrade.sh | 6 +
37 files changed, 822 insertions(+), 624 deletions(-)
delete mode 100644 Documentation/stg-cp.txt
delete mode 100644 stgit/commands/add.py
delete mode 100644 stgit/commands/copy.py
delete mode 100644 stgit/commands/rm.py
create mode 100755 t/t1203-push-conflict.sh
create mode 100755 t/t3000-git-interop.sh
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
next prev parent reply other threads:[~2007-09-24 0:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-09-24 0:02 StGit kha safe branch updated Karl Hasselström
2007-09-24 0:10 ` Karl Hasselström [this message]
-- strict thread matches above, loose matches on Subject: below --
2007-10-07 23:29 Karl Hasselström
2007-10-07 23:39 ` StGit kha experimental " Karl Hasselström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070924001034.GB24403@diana.vm.bytemark.co.uk \
--to=kha@treskal.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).