{"thread":{"id":"9989","subject":"StGit kha safe branch updated","startedAt":"2007-09-24T00:02:44Z","lastAt":"2007-09-24T00:10:34Z","messageCount":2,"participants":["Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"53877","messageId":"20070924000244.GA24403@diana.vm.bytemark.co.uk","threadId":"9989","inReplyTo":null,"subject":"StGit kha safe branch updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-09-24T00:02:44Z","receivedAt":"2007-09-24T00:02:44Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"These are the first ten patches of David's latest series (including\nthe fixup he suggested) -- that is, only the cleanup part -- plus the\nthree patches I just mailed out.\n\nThe following changes since commit ead8e89297dfabf7c290338a86c89f19c5ba7401:\n  Catalin Marinas (1):\n        Print 'updating patch' earlier in 'edit'\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git safe\n\nDavid Kågedal (10):\n      Add some more tests of \"stg status\" output\n      Clear up semantics of tree_status\n      Moved that status function to the status command file\n      Split Series.push_patch in two\n      Remove dead code from push_empty_patch\n      Refactor Series.push_patch\n      Clean up Series.refresh_patch\n      Add a 'bottom' parameter to Series.refresh_patch and use it\n      Clear up the semantics of Series.new_patch\n      Refactor Series.new_patch\n\nKarl Hasselström (3):\n      New test: make sure tha we can run \"stg help\"\n      Make sure that the output of \"stg status\" is sorted\n      New policy: Only use test_expect_failure for broken tests\n\n stgit/commands/common.py      |    2 +-\n stgit/commands/status.py      |   45 +++++++++++-\n stgit/commands/uncommit.py    |    1 +\n stgit/git.py                  |   61 ++++------------\n stgit/stack.py                |  155 ++++++++++++++++++++++------------------\n t/README                      |    9 +--\n t/t0001-subdir-branches.sh    |    9 ++-\n t/t0002-status.sh             |   36 ++++++++++\n t/t0100-help.sh               |   15 ++++\n t/t1000-branch-create.sh      |    8 +-\n t/t1001-branch-rename.sh      |    4 +-\n t/t1002-branch-clone.sh       |    4 +-\n t/t1200-push-modified.sh      |    4 +-\n t/t1202-push-undo.sh          |    4 +-\n t/t2000-sync.sh               |    8 +-\n t/t2100-pull-policy-fetch.sh  |    4 +-\n t/t2102-pull-policy-rebase.sh |   12 ++--\n t/t2200-rebase.sh             |    4 +-\n 18 files changed, 230 insertions(+), 155 deletions(-)\n create mode 100755 t/t0100-help.sh\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"53878","messageId":"20070924001034.GB24403@diana.vm.bytemark.co.uk","threadId":"9989","inReplyTo":"20070924000244.GA24403@diana.vm.bytemark.co.uk","subject":"StGit kha experimental branch updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-09-24T00:10:34Z","receivedAt":"2007-09-24T00:10:34Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"The three last patches of David's top/bottom removal series are here,\nand all the old patches too. Changes:\n\n  * Everything's been rebased on top of David's top/bottom removal\n    series, which turned out to be a major undertaking. I'm not 100%\n    sure I've managed to not break anything.\n\n  * I've modified the conflict series to adhere to the new test suite\n    policy; it now passes the test suite at every point, by using\n    test_expect_failure for broken tests.\n\n  * The add/rm/cp removal patches no longer break \"stg help\".\n\nThe following changes since commit 5f594e90e9a0867e1b87ffb8b0a077152246b56c:\n  Karl Hasselström (1):\n        New policy: Only use test_expect_failure for broken tests\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git experimental\n\nDavid Kågedal (9):\n      Check bottom and invariants\n      Remove the 'bottom' field\n      Remove the 'top' field\n      Split git.merge into two functions\n      Leave working dir and index alone after failed (conflicting) push\n      Added a test case to check what happens when push finds a conflict\n      Simplify merge_recursive\n      Use the output from merge-recursive to list conflicts\n      Ask git about unmerged files\n\nKarl Hasselström (20):\n      Remove the --force flag to \"stg rebase\" and \"stg pull\"\n      Better error message if merge fails\n      Fix \"stg resolved\" to work with new conflict representation\n      Refactoring: pass more than one file to resolved()\n      We keep the different stages of a conflict in the index now\n      Clean up the logic in \"stg resolved\"\n      \"stg status --reset\" is not needed anymore\n      Remove \"stg add\"\n      Remove \"stg rm\"\n      Remove \"stg cp\"\n      Compute patch appliedness from commit DAG\n      Test the new DAG appliedness machinery\n      Fix bash completion after the DAG appliedness patch\n      Speed up the appliedness test\n      Speed up the discovery of uninteresting commits\n      Speed up appliedness check during patch creation\n      Don't traverse the whole DAG when looking for uninteresting commits\n      Find uninteresting commits faster for special cases\n      Optimize uninterestingness checks for rebase\n      Merge branch 'conflict' into experimental\n\n Documentation/stg-cp.txt      |   63 -----\n Documentation/tutorial.txt    |   22 +-\n contrib/stgit-completion.bash |   15 +-\n stgit/commands/add.py         |   43 ---\n stgit/commands/commit.py      |    8 +-\n stgit/commands/common.py      |   34 +--\n stgit/commands/copy.py        |   44 ---\n stgit/commands/float.py       |    2 +-\n stgit/commands/pick.py        |    2 +-\n stgit/commands/pull.py        |    5 +-\n stgit/commands/rebase.py      |    5 +-\n stgit/commands/resolved.py    |   70 ++---\n stgit/commands/rm.py          |   47 ---\n stgit/commands/status.py      |   34 +--\n stgit/commands/sync.py        |    1 -\n stgit/git.py                  |   72 +++--\n stgit/gitmergeonefile.py      |   99 ++++---\n stgit/main.py                 |    6 -\n stgit/run.py                  |    3 +\n stgit/stack.py                |  620 ++++++++++++++++++++++++++++++++---------\n t/t0002-status.sh             |   11 +-\n t/t1200-push-modified.sh      |    2 +-\n t/t1202-push-undo.sh          |    4 +-\n t/t1203-push-conflict.sh      |   70 +++++\n t/t1300-uncommit.sh           |    4 +-\n t/t1301-assimilate.sh         |    2 +-\n t/t1400-patch-history.sh      |    4 +-\n t/t1500-float.sh              |   14 +-\n t/t1600-delete-one.sh         |   12 +-\n t/t1601-delete-many.sh        |    2 +-\n t/t1700-goto-top.sh           |    2 +-\n t/t2000-sync.sh               |    8 +-\n t/t2100-pull-policy-fetch.sh  |   18 +-\n t/t2101-pull-policy-pull.sh   |    4 +-\n t/t2102-pull-policy-rebase.sh |   28 +--\n t/t3000-git-interop.sh        |   60 ++++\n t/t4000-upgrade.sh            |    6 +\n 37 files changed, 822 insertions(+), 624 deletions(-)\n delete mode 100644 Documentation/stg-cp.txt\n delete mode 100644 stgit/commands/add.py\n delete mode 100644 stgit/commands/copy.py\n delete mode 100644 stgit/commands/rm.py\n create mode 100755 t/t1203-push-conflict.sh\n create mode 100755 t/t3000-git-interop.sh\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"}]}