changeset 154:5c584f0bb8aa

Merge commit 'origin/master'
author Scott Chacon <schacon@gmail.com>
date Wed, 27 May 2009 16:29:07 -0700
parents 4e7c50f8b60a (current diff) 763ae6988091 (diff)
children 4d2cc26a6e51
files
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/README.md	Wed May 27 16:28:53 2009 -0700
+++ b/README.md	Wed May 27 16:29:07 2009 -0700
@@ -1,6 +1,6 @@
 *Warning: This plugin is not yet stabilized. Use to help me identify bugs, but it will be a few weeks before its fully stable.*
 
-*Project status as of 5/11:*  Pretty solid, but a bit slow - can losslessly convert most major scenarios and can handle projects up to several thousand commits. Submodules and octopus merges in Git are not handled, nor are tags in either system. See TODO.txt for full list of things I'm working on.
+*Project status as of 5/27:*  Pretty solid, but a bit slow - can losslessly convert most major scenarios and can handle projects up to several thousand commits. Submodules and octopus merges in Git are not handled. See TODO.txt for full list of things I'm working on.
 
 
 Hg-Git Mercurial Plugin
--- a/TODO.txt	Wed May 27 16:28:53 2009 -0700
+++ b/TODO.txt	Wed May 27 16:29:07 2009 -0700
@@ -11,7 +11,6 @@
 
 MAPPING ISSUES
 ==============
-Created in Git:
 * octopus merge explode/implode
 
 * work in Git on a named branch created in Hg is forward-ported to be named branch commits in Hg and stripped back out if re-exported
@@ -23,6 +22,7 @@
 * push with branch names (w/ proper error messages)
 * explain what branch mapping policy determined when updating refs
 * add a warning for a non-fast forward push
+* error nicer if pushing to remote without push access (over git://)
 
 WEBSITE
 ===========