[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git
Subject:    StGit fixes and experimental branches updated
From:       Karl =?iso-8859-1?Q?Hasselstr=F6m?= <kha () treskal ! com>
Date:       2007-08-31 19:12:10
Message-ID: 20070831191210.GA2151 () diana ! vm ! bytemark ! co ! uk
[Download RAW message or body]

The "master" (experimental) branch is for test driving by interested
parties; the "fixes" branch is stuff that Catalin might want to pull.

                                 -+-

The following changes since commit 18669b744dbc40df9ce025f3db44a28f7aba29ff:
  Catalin Marinas (1):
        Add the '--exclusive' option to 'uncommit'

are available in the git repository at:

  git://repo.or.cz/stgit/kha.git fixes

David Kågedal (2):
      Add basic test for stg status
      Cleanup tree_status and use -z

Karl Hasselström (2):
      Write warnings and errors to stderr if not on a terminal
      Don't fail just because a subprocess wrote stuff to stderr

Pavel Roskin (2):
      Use --force to overwrite python files
      Fix refresh -es

 Makefile                  |    2 +-
 stgit/commands/patches.py |    2 +-
 stgit/commands/refresh.py |    2 +-
 stgit/git.py              |   22 +++++++++++-----------
 stgit/out.py              |   11 +++++++++--
 stgit/run.py              |    5 ++++-
 stgit/stack.py            |    3 ++-
 t/t0002-status.sh         |   15 +++++++++++++++
 8 files changed, 44 insertions(+), 18 deletions(-)
 create mode 100755 t/t0002-status.sh

                                 -+-

The following changes since commit f1c5519a186e6ed20a4206be093cc1b14e755984:
  Pavel Roskin (1):
        Fix refresh -es

are available in the git repository at:

  git://repo.or.cz/stgit/kha.git master

David Kågedal (6):
      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 (11):
      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
      Better error message if merge fails
      Merge branch 'conflict'

 contrib/stgit-completion.bash |   15 +-
 stgit/commands/commit.py      |    8 +-
 stgit/commands/common.py      |    8 +-
 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                  |   74 ++++--
 stgit/stack.py                |  574 +++++++++++++++++++++++++++++++++--------
 t/t1203-push-conflict.sh      |   70 +++++
 t/t3000-git-interop.sh        |   60 +++++
 t/t4000-upgrade.sh            |    6 +
 13 files changed, 668 insertions(+), 157 deletions(-)
 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
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]