{"thread":{"id":"10185","subject":"StGit kha safe branch updated","startedAt":"2007-10-07T23:29:43Z","lastAt":"2007-10-07T23:39:02Z","messageCount":2,"participants":["Karl Hasselström"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"55127","messageId":"20071007232943.GA1262@diana.vm.bytemark.co.uk","threadId":"10185","inReplyTo":null,"subject":"StGit kha safe branch updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-10-07T23:29:43Z","receivedAt":"2007-10-07T23:29:43Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"These are the assimilate patches, plus the two new series I just\nmailed out.\n\nThe following changes since commit 764d110156e4951ca5671a700ee2402fa3597734:\n  Yann Dirson (1):\n        Better diagnostic for wrong branch configuration.\n\nare available in the git repository at:\n\n  git://repo.or.cz/stgit/kha.git safe\n\nKarl Hasselström (16):\n      Teach \"stg assimilate\" to repair patch reachability\n      Test the new powers of \"stg assimilate\"\n      Let \"stg assimilate\" handle missing patches\n      Add --ack/--sign options to \"stg new\"\n      New test: \"stg pop --keep\"\n      Fix up the help text for \"stg edit\"\n      Don't split long and short description in \"stg edit\"\n      Make a common superclass for all StGit exceptions\n      Simplify debug level error checking\n      Discard stderr output from git-rev-parse\n      Remove the --force flag to \"stg rebase\" and \"stg pull\"\n      Infrastructure for current directory handling\n      New test: Try \"stg push\" in a subdirectory\n      Make \"stg push\" subdirectory safe\n      New test: try \"stg refresh\" in a subdirectory\n      Make \"stg refresh\" subdirectory safe\n\n stgit/commands/add.py         |    1 +\n stgit/commands/applied.py     |    1 +\n stgit/commands/assimilate.py  |  199 +++++++++++++++++++++++++++++++----------\n stgit/commands/branch.py      |    1 +\n stgit/commands/clean.py       |    1 +\n stgit/commands/clone.py       |    1 +\n stgit/commands/commit.py      |    1 +\n stgit/commands/common.py      |   88 +++++++++++++++---\n stgit/commands/copy.py        |    1 +\n stgit/commands/delete.py      |    1 +\n stgit/commands/diff.py        |    1 +\n stgit/commands/edit.py        |   34 ++++----\n stgit/commands/export.py      |    1 +\n stgit/commands/files.py       |    1 +\n stgit/commands/float.py       |    1 +\n stgit/commands/fold.py        |    1 +\n stgit/commands/goto.py        |    1 +\n stgit/commands/hide.py        |    1 +\n stgit/commands/id.py          |    1 +\n stgit/commands/imprt.py       |    1 +\n stgit/commands/init.py        |    1 +\n stgit/commands/log.py         |    1 +\n stgit/commands/mail.py        |    1 +\n stgit/commands/new.py         |    7 +-\n stgit/commands/patches.py     |    1 +\n stgit/commands/pick.py        |    1 +\n stgit/commands/pop.py         |    1 +\n stgit/commands/pull.py        |    6 +-\n stgit/commands/push.py        |    1 +\n stgit/commands/rebase.py      |    6 +-\n stgit/commands/refresh.py     |    1 +\n stgit/commands/rename.py      |    1 +\n stgit/commands/resolved.py    |    1 +\n stgit/commands/rm.py          |    1 +\n stgit/commands/series.py      |    1 +\n stgit/commands/show.py        |    1 +\n stgit/commands/sink.py        |    1 +\n stgit/commands/status.py      |    1 +\n stgit/commands/sync.py        |    1 +\n stgit/commands/top.py         |    1 +\n stgit/commands/unapplied.py   |    1 +\n stgit/commands/uncommit.py    |    1 +\n stgit/commands/unhide.py      |    1 +\n stgit/config.py               |    3 +-\n stgit/exception.py            |    3 +\n stgit/git.py                  |    6 +-\n stgit/gitmergeonefile.py      |    3 +-\n stgit/main.py                 |   17 ++---\n stgit/run.py                  |    5 +-\n stgit/stack.py                |   20 +++-\n stgit/utils.py                |    3 +-\n t/t1204-pop-keep.sh           |   42 +++++++++\n t/t1205-push-subdir.sh        |   55 +++++++++++\n t/t1301-assimilate.sh         |   12 +--\n t/t1302-assimilate-interop.sh |   59 ++++++++++++\n t/t2100-pull-policy-fetch.sh  |   14 ---\n t/t2102-pull-policy-rebase.sh |   24 -----\n t/t2300-refresh-subdir.sh     |   27 ++++++\n 58 files changed, 514 insertions(+), 156 deletions(-)\n create mode 100644 stgit/exception.py\n create mode 100755 t/t1204-pop-keep.sh\n create mode 100755 t/t1205-push-subdir.sh\n create mode 100755 t/t1302-assimilate-interop.sh\n create mode 100755 t/t2300-refresh-subdir.sh\n\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"},{"id":"55131","messageId":"20071007233902.GB1262@diana.vm.bytemark.co.uk","threadId":"10185","inReplyTo":"20071007232943.GA1262@diana.vm.bytemark.co.uk","subject":"StGit kha experimental branch updated","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-10-07T23:39:02Z","receivedAt":"2007-10-07T23:39:02Z","isPatch":false,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"There's nothing new here; it's all just rebased on top of the updated\nsafe branch. In order, we have\n\n  * David's patches that remove the \"top\" and \"bottom\" patch fields.\n    These need a format version upgrade function (trivial), but are\n    otherwise ready, I think.\n\n  * David's conflict refactoring series, with some fixes by me, and\n    removal of some commands that become superfluous. Almost ready,\n    but it makes ugly conflict markers, and \"stg resolved\" should\n    probably be removed.\n\nThe following changes since commit 2299c463794f214b750ecc33e24779243ddc5aff:\n  Karl Hasselström (1):\n        Make \"stg refresh\" subdirectory safe\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 (9):\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\n Documentation/stg-cp.txt      |   63 --------------------------\n Documentation/tutorial.txt    |   22 +++++----\n stgit/commands/add.py         |   44 ------------------\n stgit/commands/common.py      |   25 +++-------\n stgit/commands/copy.py        |   45 ------------------\n stgit/commands/pick.py        |    2 +-\n stgit/commands/resolved.py    |   70 ++++++++++-------------------\n stgit/commands/rm.py          |   48 --------------------\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                |   65 +++++++++++----------------\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/t1204-pop-keep.sh           |    2 +-\n t/t1205-push-subdir.sh        |    4 +-\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  |    4 +-\n t/t2101-pull-policy-pull.sh   |    4 +-\n t/t2102-pull-policy-rebase.sh |    4 +-\n t/t2300-refresh-subdir.sh     |    2 +-\n 33 files changed, 295 insertions(+), 459 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\n-- \nKarl Hasselström, kha@treskal.com\n      www.treskal.com/kalle\n"}]}