{"thread":{"id":"9729","subject":"StGit fixes and experimental branches updated","startedAt":"2007-08-31T19:12:10Z","lastAt":"2007-08-31T19:12:10Z","messageCount":1,"participants":["Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"52068","messageId":"20070831191210.GA2151@diana.vm.bytemark.co.uk","threadId":"9729","inReplyTo":null,"subject":"StGit fixes and experimental branches updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-08-31T19:12:10Z","receivedAt":"2007-08-31T19:12:10Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"The \"master\" (experimental) branch is for test driving by interested\nparties; the \"fixes\" branch is stuff that Catalin might want to pull.\n\n                                 -+-\n\nThe following changes since commit 18669b744dbc40df9ce025f3db44a28f7aba29ff:\n  Catalin Marinas (1):\n        Add the '--exclusive' option to 'uncommit'\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git fixes\n\nDavid Kågedal (2):\n      Add basic test for stg status\n      Cleanup tree_status and use -z\n\nKarl Hasselström (2):\n      Write warnings and errors to stderr if not on a terminal\n      Don't fail just because a subprocess wrote stuff to stderr\n\nPavel Roskin (2):\n      Use --force to overwrite python files\n      Fix refresh -es\n\n Makefile                  |    2 +-\n stgit/commands/patches.py |    2 +-\n stgit/commands/refresh.py |    2 +-\n stgit/git.py              |   22 +++++++++++-----------\n stgit/out.py              |   11 +++++++++--\n stgit/run.py              |    5 ++++-\n stgit/stack.py            |    3 ++-\n t/t0002-status.sh         |   15 +++++++++++++++\n 8 files changed, 44 insertions(+), 18 deletions(-)\n create mode 100755 t/t0002-status.sh\n\n                                 -+-\n\nThe following changes since commit f1c5519a186e6ed20a4206be093cc1b14e755984:\n  Pavel Roskin (1):\n        Fix refresh -es\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git master\n\nDavid Kågedal (6):\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 (11):\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      Better error message if merge fails\n      Merge branch 'conflict'\n\n contrib/stgit-completion.bash |   15 +-\n stgit/commands/commit.py      |    8 +-\n stgit/commands/common.py      |    8 +-\n stgit/commands/float.py       |    2 +-\n stgit/commands/imprt.py       |    2 +-\n stgit/commands/pick.py        |    2 +-\n stgit/commands/refresh.py     |    2 +-\n stgit/commands/sync.py        |    2 +-\n stgit/git.py                  |   74 ++++--\n stgit/stack.py                |  574 +++++++++++++++++++++++++++++++++--------\n t/t1203-push-conflict.sh      |   70 +++++\n t/t3000-git-interop.sh        |   60 +++++\n t/t4000-upgrade.sh            |    6 +\n 13 files changed, 668 insertions(+), 157 deletions(-)\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"}]}