File "/usr/lib/python3/dist-packages/IPython/config/__init__.py", line 16, in <module> from .application import * File "/usr/lib/python3/dist-packages/IPython/config/application.py", line 31, in <module> from IPython.config.configurable import SingletonConfigurable File "/usr/lib/python3/dist-packages/IPython/config/configurable.py", line 33, in <module> from IPython.utils.text import indent, wrap_paragraphs File "/usr/lib/python3/dist-packages/IPython/utils/text.py", line 28, in <module> from IPython.external.path import path File "/usr/lib/python3/dist-packages/IPython/external/path/__init__.py", line 2, in <module> from path import * File "/home/jhammel/python/path.py", line 25 print root(path) ^

#!/bin/bash

# merge a hg branch repo
# from https://wiki.mozilla.org/User:Asasaki:Cedar
# TODO: inclusion in mercurial utilities package

if [[ "$#" != "3" ]]
then
    echo "Usage: hg-merge-branch.sh scheme://hg/repository"
    exit 1
fi

if ! hg root
then
    exit 255
fi

# Update to latest
# the hg up -C will blow away any local changes!
#hg pull
#hg up -C -r default

# Pull latest branch changes in
#hg pull $1
#hg merge
#hg commit -m "Merge m-c -> cedar"