Skip to content
Snippets Groups Projects
Commit 5c584f0b authored by Scott Chacon's avatar Scott Chacon
Browse files

Merge commit 'origin/master'

parents 4e7c50f8 763ae698
No related branches found
No related tags found
No related merge requests found
*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
......
......@@ -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
===========
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment