git-toolbelt @1.9.0 conflicts with git-extras @7.0.0_1

[cooljeanius (Eric Gallager)]

They both try to install a git-local-commits executable:

x ./opt/local/bin/git-unstage-all
Error: Failed to activate git-toolbelt: Image error: /opt/local/bin/git-local-commits is being used by the active git-extras port.  Please deactivate this port first, or use 'port -f activate git-toolbelt' to force the activation.
    while executing
"throw registry::image-error $msg"
    ("foreach" body line 47)
    invoked from within
"foreach file $imagefiles {
                set srcfile "${extracted_dir}${file}"

                # To be able to install links, we test if we can lst..."
    invoked from within
"registry::write {
            foreach file $imagefiles {
                set srcfile "${extracted_dir}${file}"

                # To be able to instal..."
DEBUG: Error code: registry::image-error
DEBUG: Backtrace: Image error: /opt/local/bin/git-local-commits is being used by the active git-extras port.  Please deactivate this port first, or use 'port -f activate git-toolbelt' to force the activation.
    while executing
"throw registry::image-error $msg"
    ("foreach" body line 47)
    invoked from within
"foreach file $imagefiles {
                set srcfile "${extracted_dir}${file}"

                # To be able to install links, we test if we can lst..."
    invoked from within
"registry::write {
            foreach file $imagefiles {
                set srcfile "${extracted_dir}${file}"

                # To be able to instal..."
    while executing
"throw [dict get $eOptions -errorcode] [dict get $eOptions -errorinfo]"
    (procedure "_activate_contents" line 200)
    invoked from within
"_activate_contents $requested $rename_list"
    (procedure "portimage::activate" line 70)
    invoked from within
"registry_activate $subport $_inregistry_version $_inregistry_revision $_inregistry_variants $optionlist"
    (procedure "portactivate::activate_main" line 20)
    invoked from within
"$procedure $targetname"

This conflict should either be fixed, or at least marked.

[cooljeanius (Eric Gallager)]

Ran into this again today. Herby or Eitan, do either of you know which one is the canonical version?