old_contents: from distutils.core import setup
  
  setup(
      name = 'sapling',
      version = '0.0.3',
  
      author = 'John Sirois',
      author_email = 'john.sirois@gmail.com',
      description = 'A git porcelain to manage bidirectional subtree syncing with foreign git '
                    'repositories',
      license = 'Apache License Version 2.0',
      url = 'http://github.com/jsirois/sapling',
  
      provides = 'sapling',
      install_requires = (
        'gitdb >= 0.5.1',
        'GitPython > 0.2, < 0.4',
      ),
  
      packages = [ 'saplib' ],
      scripts = [ 'sapling.py' ],
  
      classifiers = [
        'Programming Language :: Python',
        'Programming Language :: Python :: 2.6',
        'Development Status :: 2 - Pre-Alpha',
        'Environment :: Console',
        'Intended Audience :: Developers',
        'License :: OSI Approved :: Apache Software License',
  
        # TODO(jsirois): the sapling.py --install action is actually unix/symlink dependant -
        # perhaps detect windows and just copy the sapling.py script to git-core/git-sap ?
        'Operating System :: OS Independent',
  
        'Topic :: Software Development :: Version Control'
      ],
  )
  
new_contents: from distutils.core import setup
  
  setup(
      name = 'sapling',
      version = '0.0.4',
  
      author = 'John Sirois',
      author_email = 'john.sirois@gmail.com',
      description = 'A git porcelain to manage bidirectional subtree syncing with foreign git '
                    'repositories',
      license = 'Apache License Version 2.0',
      url = 'http://github.com/jsirois/sapling',
  
      provides = 'sapling',
      install_requires = (
        'gitdb >= 0.5.1',
        'GitPython > 0.2, < 0.4',
      ),
  
      packages = [ 'saplib' ],
      scripts = [ 'sapling.py' ],
  
      classifiers = [
        'Programming Language :: Python',
        'Programming Language :: Python :: 2.6',
        'Development Status :: 2 - Pre-Alpha',
        'Environment :: Console',
        'Intended Audience :: Developers',
        'License :: OSI Approved :: Apache Software License',
  
        # TODO(jsirois): the sapling.py --install action is actually unix/symlink dependant -
        # perhaps detect windows and just copy the sapling.py script to git-core/git-sap ?
        'Operating System :: OS Independent',
  
        'Topic :: Software Development :: Version Control'
      ],
  )
  
subject: Bump version to 0.0.4: + support idempotent splitting + document 2 methods of idempotent merging + document know issues + provide a roadmap