Merge lp:~akretion-team/anybox.recipe.openerp/git-shallow-clone into lp:anybox.recipe.openerp

[Raphaël Valyi - http://www.akretion.com]

git shallow clone support through the depth option. Save the planet from full clones!

[Laurent Mignon (Acsone) (lmi)]

It would be nice to specify generically any argument in the options for the fetch command. We could imagine a naming convention for the options. ex 'fetch.depth', 'fetch.prune'.
The code could be:
for option, value in self.options.items():
   if not option.statswith('fetch'):
       continue
    arg = '--%s' %option.split('.')[1]
    if value:
       arg += "=%s"%value
    fetch_cmd.extend([arg]])

Just an idea

[lp:~akretion-team/anybox.recipe.openerp/git-shallow-clone]

549. By Georges Racinet on 2014-06-16

1.8.4 release

550. By Georges Racinet on 2014-06-16

New dev cycle

551. By Georges Racinet on 2014-06-16

Bumped version in doc, and setup less confusing doc upload path

552. By Georges Racinet on 2014-06-16

[MRG] merged fix for #1249566

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Agree.

Also, it seems that at update having that depth option might cause issues.

Setting as work in progress for now.

[Georges Racinet (gracinet)]

I've got the vague feeling that it'd be preferable to have a globally named depth option rather that tying it as an option for fetch, because depth feels like a property of the repo, and we might in the future use other subcommands as fetch that would also be affected by it.

[Georges Racinet (gracinet)]

Did some testing, the suggested patch works for the master branch only.
That's because currently the recipe will fetch without arguments, and then try and checkout the wished branch.

Therefore I guess this very wanted feature will take a bit of refactoring.

review: Needs Fixing

[Georges Racinet (gracinet)]

To be clear, and not to waste your time : I'll try and come up with a working version today/this week.

[lp:~akretion-team/anybox.recipe.openerp/git-shallow-clone]

553. By Georges Racinet on 2014-07-09

Providing environments initialization in runtime.session

This needs further testing, in particular with older OpenERP/Odoo versions
Besides, the current Odoo master version that this has been developped
against calls itself 9.0.0 alpha, one needs to check if the problem
exists for the 8.0 branch.

At this point, I'm not really sure of what happens for a script that would
spawn several threads.

554. By Raphaël Valyi - http://www.akretion.com on 2014-07-12

merge git-shallow-clone

555. By Raphaël Valyi - http://www.akretion.com on 2014-07-16

git checkout -f; git merge -> git pull

556. By Raphaël Valyi - http://www.akretion.com on 2014-07-17

WIP

557. By Raphaël Valyi - http://www.akretion.com on 2014-07-17

WIP

558. By Raphaël Valyi - http://www.akretion.com on 2014-07-17

WIP

559. By Raphaël Valyi - http://www.akretion.com on 2014-07-17

WIP

560. By Raphaël Valyi - http://www.akretion.com on 2014-07-18

working version with pip; hacky though

561. By Raphaël Valyi - http://www.akretion.com on 2014-07-18

WIP bypass zc.buildout totally

Unmerged revisions

561. By Raphaël Valyi - http://www.akretion.com on 2014-07-18

WIP bypass zc.buildout totally

560. By Raphaël Valyi - http://www.akretion.com on 2014-07-18

working version with pip; hacky though

559. By Raphaël Valyi - http://www.akretion.com on 2014-07-17

WIP

558. By Raphaël Valyi - http://www.akretion.com on 2014-07-17

WIP

557. By Raphaël Valyi - http://www.akretion.com on 2014-07-17

WIP

556. By Raphaël Valyi - http://www.akretion.com on 2014-07-17

WIP

555. By Raphaël Valyi - http://www.akretion.com on 2014-07-16

git checkout -f; git merge -> git pull

554. By Raphaël Valyi - http://www.akretion.com on 2014-07-12

merge git-shallow-clone

=== modified file 'CHANGES.rst'
--- CHANGES.rst	2014-06-16 23:27:47 +0000
+++ CHANGES.rst	2014-07-18 23:12:56 +0000
@@ -5,6 +5,7 @@
 Changes displayed as "unreleased" in the stable series are released
 with any higher released unstable versions.
 
+<<<<<<< TREE
 1.9.0 (unreleased)
 ------------------
 - launchpad #1294020: vcs-revert=on-merge option, and implementation
@@ -21,6 +22,18 @@
 1.8.4 (2014-06-16)
 ------------------
 - launchpad #1327756: support new addons layout on github
+=======
+1.8.5 (unreleased)
+------------------
+- launchpad #1338405: provided necessary environments init in session
+  (needed for interactive session and various scripts)
+- launchpad #1249566: [bzr] avoid outgoing requests in offline mode
+  due to lp: locations resolution
+
+1.8.4 (2014-06-16)
+------------------
+- launchpad #1327756: support new addons layout on github
+>>>>>>> MERGE-SOURCE
 - launchpad #1324579: [odoo] generation of gevent script (longpolling)
   and have it used through the --workers option
 - launchpad #1321919: [v8] fixed potential masking of standard library

=== modified file 'README.rst'
--- README.rst	2014-06-16 23:27:47 +0000
+++ README.rst	2014-07-18 23:12:56 +0000
@@ -72,5 +72,9 @@
  * Jacques-Etienne Baudoux
  * Laurent Mignon
  * Leonardo Pistone
+<<<<<<< TREE
  * Stefan Rijnhart
  * Stéphane Bidoul
+=======
+ * Stefan Rijnhart
+>>>>>>> MERGE-SOURCE

=== modified file 'anybox/recipe/openerp/base.py'
--- anybox/recipe/openerp/base.py	2014-06-16 23:27:47 +0000
+++ anybox/recipe/openerp/base.py	2014-07-18 23:12:56 +0000
@@ -3,6 +3,7 @@
 import os
 import sys
 import urllib
+import subprocess
 import tarfile
 import setuptools
 import logging
@@ -276,11 +277,18 @@
         If some distributions are known as soft requirements, will retry
         without them
         """
+        eggs = "\n".join([i for i in self.options['eggs'].split(os.linesep) if i not in ['Pillow', 'openerp', 'pychart', 'anybox.recipe.openerp', 'anybox']])
+        requirement_file = os.path.join(os.getcwd(), 'odoo_requirements.txt')
+        with open(requirement_file, 'w') as the_file:
+            the_file.write('--find-links=http://download.gna.org/pychart\n')
+            the_file.write(eggs)
+        subprocess.call(['pip', 'install', '-r', requirement_file])
         while True:
             missing = None
             eggs = zc.recipe.egg.Scripts(self.buildout, '', self.options)
             try:
-                eggs.install()
+                pass
+#                eggs.install()
             except MissingDistribution, exc:
                 missing = exc.data[0].project_name
             except VersionConflict:
@@ -289,10 +297,10 @@
                 missing = exc.message.split(os.linesep)[0].split()[-1]
 
             if missing is not None:
-                msg = self.missing_deps_instructions.get(missing)
-                if msg is None:
-                    raise
-                logger.error("Could not find %r. " + msg, missing)
+#                msg = self.missing_deps_instructions.get(missing)
+#                if msg is None:
+#                    raise
+#                logger.error("Could not find %r. " + msg, missing)
                 # GR this condition won't be enough in case of version
                 # conditions in requirement
                 if missing not in self.soft_requirements:
@@ -304,7 +312,11 @@
             else:
                 break
 
-        self.eggs_reqs, self.eggs_ws = eggs.working_set()
+#        offline = eggs.buildout['buildout'].get('offline')
+#        eggs.buildout['buildout']['offline'] = 'true'
+#        self.eggs_reqs, self.eggs_ws = eggs.working_set()
+#        eggs.buildout['buildout']['offline'] = offline
+        self.eggs_reqs, self.eggs_ws = [], []#eggs.working_set()
         self.ws = self.eggs_ws
 
     def apply_version_dependent_decisions(self):
@@ -813,9 +825,12 @@
 
         if self.version_detected is None:
             raise EnvironmentError('Version of OpenERP could not be detected')
-        self.merge_requirements()
-        self.install_requirements()
-
+        # NOTE we could eventually activate these 2 lines
+        # that would try to install Odoo requirements with pip here
+#        self.merge_requirements()
+#        self.install_requirements()
+        self.eggs_reqs, self.eggs_ws = [], []#eggs.working_set()
+        self.ws = self.eggs_ws
         self._install_startup_scripts()
 
         # create the config file

=== modified file 'anybox/recipe/openerp/runtime/session.py'
--- anybox/recipe/openerp/runtime/session.py	2014-04-30 13:42:42 +0000
+++ anybox/recipe/openerp/runtime/session.py	2014-07-18 23:12:56 +0000
@@ -177,6 +177,67 @@
         config['without_demo'] = saved_without_demo
         self.init_cursor()
         self.uid = SUPERUSER_ID
+        self.init_environments()
+
+    def init_environments(self):
+        """Enter the environments context manager, but don't leave it
+
+        Automatically called by :meth:`open` and registry altering methods.
+        See :class:``openerp.api.Environment`` for explanations about
+        environments.
+
+        For OpenERP/Odoo versions prior to the new style API merge, this
+        is a no-op.
+
+        This thread-local ``environments`` is initialized and cleaned with
+        each request in the normal usage of the framework.
+        That's why is is provided as a context manager.
+
+        Therefore, user code probably needs in some case to clean it to avoid
+        side effects. This can be done by calling :meth:`clean_environments`.
+        """
+        try:
+            gen_factory = openerp.api.Environment.manage
+        except AttributeError:
+            return
+
+        self._environments_gen_context = gen_factory().gen
+        self._environments_gen_context.next()
+
+    def clean_environments(self, reinit=True):
+        """Cleans the thread-local environment.
+
+        See :meth:`init_environments` for more details.
+        This method does nothing if the environments have not been initialized.
+
+        :param bool reinit: if ``True``, :meth:`init_environments` will be
+                            called again after cleaning
+        """
+        try:
+            gen_context = self._environments_gen_context
+        except AttributeError:
+            return
+
+        try:
+            gen_context.next()
+        except StopIteration:
+            pass
+        else:
+            logger.warn("clean_environments: we had the context manager, but "
+                        "it had not been called. This suggest low-leve "
+                        "tampering with it that should be more cautious. "
+                        "Proceeding with cleansing.")
+            try:
+                gen_context.next()
+            except StopIteration:
+                pass
+            else:
+                raise RuntimeError("Called the environments context manager "
+                                   "twice and it's not finished. "
+                                   "This is really unexpected.")
+        del self._environments_gen_context
+        if reinit:
+            self.init_environments()
 
     # A later version might read that from buildout configuration.
     _version_parameter_name = DEFAULT_VERSION_PARAMETER
@@ -277,6 +338,7 @@
 
     def rollback(self):
         self.cr.rollback()
+        self.clean_environments()
 
     def close(self):
         """Close the cursor and forget about the current database.
@@ -285,6 +347,7 @@
         """
         dbname = self.cr.dbname
         self.cr.close()
+        self.clean_environments()
         openerp.modules.registry.RegistryManager.delete(dbname)
 
     def update_modules(self, modules, db=None):
@@ -315,6 +378,7 @@
             db, update_module=True)
         config['update'].clear()
         self.init_cursor()
+        self.clean_environments()
 
     def install_modules(self, modules, db=None, update_modules_list=True,
                         open_with_demo=False):
@@ -366,6 +430,7 @@
         config['init'].clear()
         config['without_demo'] = saved_without_demo
         self.init_cursor()
+        self.clean_environments()
 
     def handle_command_line_options(self, to_handle):
         """Handle prescribed command line options and eat them.

=== modified file 'anybox/recipe/openerp/server.py'
--- anybox/recipe/openerp/server.py	2014-06-08 12:37:29 +0000
+++ anybox/recipe/openerp/server.py	2014-07-18 23:12:56 +0000
@@ -47,6 +47,14 @@
         # discarding, because we have a special behaviour with custom
         # interpreters
         opt.pop('interpreter', None)
+        self.extra_paths = [
+os.path.join(os.getcwd(), 'anybox.recipe.openerp')
+#  'anybox.recipe.openerp',
+#  'eggs/zc.buildout-2.2.1-py2.7.egg',
+#  'eggs/zc.recipe.egg-2.0.1-py2.7.egg',
+#  'eggs/distribute-0.7.3-py2.7.egg',
+            ]
+
         self.openerp_scripts = {}
         self.missing_deps_instructions.update({
             'openerp-command': ("Please provide it with 'develop' or "
@@ -500,7 +508,10 @@
             ""))
 
         reqs, ws = self.eggs_reqs, self.eggs_ws
-        return zc.buildout.easy_install.scripts(
+        # NOTE the next line is a hack if we don't want to install the eggs dependencies
+        # via the recipe.
+        self.options['bin-directory'] = os.path.join(os.getcwd(), '..', '..', 'bin')
+        x = zc.buildout.easy_install.scripts(
             reqs, ws, sys.executable, self.options['bin-directory'],
             scripts={},
             interpreter=int_name,
@@ -510,6 +521,8 @@
             # TODO investigate these options:
             # relative_paths=self._relative_paths,
         )
+        print x
+        return x
 
     def _install_openerp_scripts(self):
         """Install scripts registered in self.openerp_scripts.

=== modified file 'anybox/recipe/openerp/vcs/bzr.py'
--- anybox/recipe/openerp/vcs/bzr.py	2014-05-16 13:14:27 +0000
+++ anybox/recipe/openerp/vcs/bzr.py	2014-07-18 23:12:56 +0000
@@ -174,6 +174,7 @@
         if not os.path.exists(self.target_dir):
             # not branched yet, there's nothing to clean
             return
+<<<<<<< TREE
             subprocess.check_call(['bzr', 'clean-tree',
                                    '--ignored', '--force'])
         with working_directory_keeper:
@@ -187,6 +188,19 @@
         with working_directory_keeper:
             os.chdir(self.target_dir)
             subprocess.check_call(['bzr', 'revert', '-r', revision])
+=======
+            subprocess.check_call(['bzr', 'clean-tree',
+                                   '--ignored', '--force'])
+        with working_directory_keeper:
+            os.chdir(self.target_dir)
+            subprocess.check_call(['bzr', 'clean-tree',
+                                   '--ignored', '--force'])
+
+    def revert(self, revision):
+        with working_directory_keeper:
+            os.chdir(self.target_dir)
+            subprocess.check_call(['bzr', 'revert', '-r', revision])
+>>>>>>> MERGE-SOURCE
 
     def _update(self, revision):
         """Update existing branch at target dir to given revision.

=== modified file 'anybox/recipe/openerp/vcs/git.py'
--- anybox/recipe/openerp/vcs/git.py	2014-07-03 22:15:08 +0000
+++ anybox/recipe/openerp/vcs/git.py	2014-07-18 23:12:56 +0000
@@ -75,6 +75,7 @@
 
             if not offline:
                 # TODO what if remote repo is actually local fs ?
+<<<<<<< TREE
                 # GR, redux: git has a two notions of local repos, which
                 # differ at least for shallow clones : path or file://
                 os.chdir(target_dir)
@@ -110,6 +111,41 @@
             # (seen with 1.7.2.5 from Debian 6)
             subprocess.check_call(['git', 'pull', '--no-edit',
                                    self.url, revision])
+=======
+                os.chdir(target_dir)
+                logger.info("%s> git remote set-url %s %s",
+                            target_dir, BUILDOUT_ORIGIN, url)
+                subprocess.call(['git', 'remote', 'set-url',
+                                 BUILDOUT_ORIGIN, url])
+                fetch_cmd = ['git', 'fetch', BUILDOUT_ORIGIN]
+                if self.options.get('depth'):
+                    fetch_cmd.extend(["--depth=%s" % self.options['depth']])
+                logger.info("%s> %s" % (target_dir, ' '.join(fetch_cmd)))
+                subprocess.check_call(fetch_cmd)
+                # TODO: check what happens when there are local changes
+                # TODO: what about the 'clean' option
+                logger.info("%s> git checkout -f %s", target_dir, revision)
+                subprocess.check_call(['git', 'checkout', '-f', revision])
+                if self._is_a_branch(revision):
+                    # fast forward
+                    logger.info("%s> git pull %s %s",
+                                target_dir, BUILDOUT_ORIGIN, revision)
+                    subprocess.check_call(['git', 'pull',
+                                           BUILDOUT_ORIGIN, revision])
+
+    def merge(self, revision):
+        """Merge revision into current branch"""
+        with working_directory_keeper:
+            if not self.is_versioned(self.target_dir):
+                raise RuntimeError("Cannot merge into non existent "
+                                   "or non git local directory %s" %
+                                   self.target_dir)
+            os.chdir(self.target_dir)
+            logger.info("%s> git pull %s %s",
+                        self.target_dir, self.url, revision)
+            subprocess.check_call(['git', 'pull', '--no-edit',
+                                   self.url, revision])
+>>>>>>> MERGE-SOURCE
 
     def archive(self, target_path):
         # TODO: does this work with merge-ins?

=== modified file 'anybox/recipe/openerp/vcs/tests/test_git.py'
--- anybox/recipe/openerp/vcs/tests/test_git.py	2014-06-17 09:36:40 +0000
+++ anybox/recipe/openerp/vcs/tests/test_git.py	2014-07-18 23:12:56 +0000
@@ -240,98 +240,182 @@
         branch("remotebranch")
         with open(os.path.join(target_dir, 'tracked')) as f:
             self.assertEquals(f.read().strip(), "last after remote branch")
-
-
-class GitMergeTestCase(GitBaseTestCase):
-
-    def create_src(self):
-        GitBaseTestCase.create_src(self)
-        os.chdir(self.src_repo)
-
-        self.make_branch(self.src_repo, 'branch1')
-        self.checkout_branch(self.src_repo, 'branch1')
-        git_write_commit(self.src_repo, 'file_on_branch1',
-                         "file on branch 1", msg="on branch 1")
-        self.checkout_branch(self.src_repo, 'master')
-
-        self.make_branch(self.src_repo, 'branch2')
-        self.checkout_branch(self.src_repo, 'branch2')
-        git_write_commit(self.src_repo, 'file_on_branch2',
-                         "file on branch 2", msg="on branch 2")
-        self.checkout_branch(self.src_repo, 'master')
-
-    def make_branch(self, src_dir, name):
-        """create a branch
-        """
-        subprocess.check_call(['git', 'branch', name], cwd=src_dir)
-
-    def checkout_branch(self, src_dir, name):
-        """checkout a branch
-        """
-        subprocess.check_call(['git', 'checkout', name], cwd=src_dir)
-
-    def test_01_check_src_repo(self):
-        """test if the creation of source repo worked as expected"""
-        target_dir = os.path.join(self.dst_dir, "to_repo")
-        repo = GitRepo(target_dir, self.src_repo)
-
-        repo('master')
-        self.assertFalse(os.path.exists(os.path.join(target_dir,
-                                                     'file_on_branch1')),
-                         'file_on_branch1 should not exist')
-        self.assertFalse(os.path.exists(os.path.join(target_dir,
-                                                     'file_on_branch2')),
-                         'file_on_branch2 should not exist')
-
-        repo('branch1')
-        self.assertTrue(os.path.exists(os.path.join(target_dir,
-                                                    'file_on_branch1')),
-                        'file_on_branch1 should exist')
-        self.assertFalse(os.path.exists(os.path.join(target_dir,
-                                                     'file_on_branch2')),
-                         'file_on_branch2 should not exist')
-
-        repo('branch2')
-        self.assertFalse(os.path.exists(os.path.join(target_dir,
-                                                     'file_on_branch1')),
-                         'file_on_branch1 should not exist')
-        self.assertTrue(os.path.exists(os.path.join(target_dir,
-                                                    'file_on_branch2')),
-                        'file_on_branch2 should exist')
-
-    def test_02_merge(self):
-        target_dir = os.path.join(self.dst_dir, "to_repo")
-        repo = GitRepo(target_dir, self.src_repo)
-        repo('master')
-        git_set_user_info(repo.target_dir)
-
-        repo.merge('branch1')
-        self.assertTrue(os.path.exists(os.path.join(target_dir,
-                                                    'file_on_branch1')),
-                        'file_on_branch1 should exist')
-        self.assertFalse(os.path.exists(os.path.join(target_dir,
-                                                     'file_on_branch2')),
-                         'file_on_branch2 should not exist')
-        repo.merge('branch2')
-        self.assertTrue(os.path.exists(os.path.join(target_dir,
-                                                    'file_on_branch1')),
-                        'file_on_branch1 should exist')
-        self.assertTrue(os.path.exists(os.path.join(target_dir,
-                                                    'file_on_branch2')),
-                        'file_on_branch2 should exist')
-
-    def test_03_revert(self):
-        target_dir = os.path.join(self.dst_dir, "to_repo")
-        repo = GitRepo(target_dir, self.src_repo)
-        repo('master')
-        git_set_user_info(repo.target_dir)
-
-        repo.merge('branch1')
-        self.assertTrue(os.path.exists(os.path.join(target_dir,
-                                                    'file_on_branch1')),
-                        'file_on_branch1 should exist')
-
-        repo.revert('master')
-        self.assertFalse(os.path.exists(os.path.join(target_dir,
-                                                     'file_on_branch1')),
-                         'file_on_branch1 should not exist')
+<<<<<<< TREE
+
+
+class GitMergeTestCase(GitBaseTestCase):
+
+    def create_src(self):
+        GitBaseTestCase.create_src(self)
+        os.chdir(self.src_repo)
+
+        self.make_branch(self.src_repo, 'branch1')
+        self.checkout_branch(self.src_repo, 'branch1')
+        git_write_commit(self.src_repo, 'file_on_branch1',
+                         "file on branch 1", msg="on branch 1")
+        self.checkout_branch(self.src_repo, 'master')
+
+        self.make_branch(self.src_repo, 'branch2')
+        self.checkout_branch(self.src_repo, 'branch2')
+        git_write_commit(self.src_repo, 'file_on_branch2',
+                         "file on branch 2", msg="on branch 2")
+        self.checkout_branch(self.src_repo, 'master')
+
+    def make_branch(self, src_dir, name):
+        """create a branch
+        """
+        subprocess.check_call(['git', 'branch', name], cwd=src_dir)
+
+    def checkout_branch(self, src_dir, name):
+        """checkout a branch
+        """
+        subprocess.check_call(['git', 'checkout', name], cwd=src_dir)
+
+    def test_01_check_src_repo(self):
+        """test if the creation of source repo worked as expected"""
+        target_dir = os.path.join(self.dst_dir, "to_repo")
+        repo = GitRepo(target_dir, self.src_repo)
+
+        repo('master')
+        self.assertFalse(os.path.exists(os.path.join(target_dir,
+                                                     'file_on_branch1')),
+                         'file_on_branch1 should not exist')
+        self.assertFalse(os.path.exists(os.path.join(target_dir,
+                                                     'file_on_branch2')),
+                         'file_on_branch2 should not exist')
+
+        repo('branch1')
+        self.assertTrue(os.path.exists(os.path.join(target_dir,
+                                                    'file_on_branch1')),
+                        'file_on_branch1 should exist')
+        self.assertFalse(os.path.exists(os.path.join(target_dir,
+                                                     'file_on_branch2')),
+                         'file_on_branch2 should not exist')
+
+        repo('branch2')
+        self.assertFalse(os.path.exists(os.path.join(target_dir,
+                                                     'file_on_branch1')),
+                         'file_on_branch1 should not exist')
+        self.assertTrue(os.path.exists(os.path.join(target_dir,
+                                                    'file_on_branch2')),
+                        'file_on_branch2 should exist')
+
+    def test_02_merge(self):
+        target_dir = os.path.join(self.dst_dir, "to_repo")
+        repo = GitRepo(target_dir, self.src_repo)
+        repo('master')
+        git_set_user_info(repo.target_dir)
+
+        repo.merge('branch1')
+        self.assertTrue(os.path.exists(os.path.join(target_dir,
+                                                    'file_on_branch1')),
+                        'file_on_branch1 should exist')
+        self.assertFalse(os.path.exists(os.path.join(target_dir,
+                                                     'file_on_branch2')),
+                         'file_on_branch2 should not exist')
+        repo.merge('branch2')
+        self.assertTrue(os.path.exists(os.path.join(target_dir,
+                                                    'file_on_branch1')),
+                        'file_on_branch1 should exist')
+        self.assertTrue(os.path.exists(os.path.join(target_dir,
+                                                    'file_on_branch2')),
+                        'file_on_branch2 should exist')
+
+    def test_03_revert(self):
+        target_dir = os.path.join(self.dst_dir, "to_repo")
+        repo = GitRepo(target_dir, self.src_repo)
+        repo('master')
+        git_set_user_info(repo.target_dir)
+
+        repo.merge('branch1')
+        self.assertTrue(os.path.exists(os.path.join(target_dir,
+                                                    'file_on_branch1')),
+                        'file_on_branch1 should exist')
+
+        repo.revert('master')
+        self.assertFalse(os.path.exists(os.path.join(target_dir,
+                                                     'file_on_branch1')),
+                         'file_on_branch1 should not exist')
+=======
+
+
+class GitMergeTestCase(GitBaseTestCase):
+
+    def create_src(self):
+        GitBaseTestCase.create_src(self)
+        os.chdir(self.src_repo)
+
+        self.make_branch(self.src_repo, 'branch1')
+        self.checkout_branch(self.src_repo, 'branch1')
+        git_write_commit(self.src_repo, 'file_on_branch1',
+                         "file on branch 1", msg="on branch 1")
+        self.checkout_branch(self.src_repo, 'master')
+
+        self.make_branch(self.src_repo, 'branch2')
+        self.checkout_branch(self.src_repo, 'branch2')
+        git_write_commit(self.src_repo, 'file_on_branch2',
+                         "file on branch 2", msg="on branch 2")
+        self.checkout_branch(self.src_repo, 'master')
+
+    def make_branch(self, src_dir, name):
+        """create a branch
+        """
+        subprocess.check_call(['git', 'branch', name], cwd=src_dir)
+
+    def checkout_branch(self, src_dir, name):
+        """checkout a branch
+        """
+        subprocess.check_call(['git', 'checkout', name], cwd=src_dir)
+
+    def test_01_check_src_repo(self):
+        """test if the creation of source repo worked as expected"""
+        target_dir = os.path.join(self.dst_dir, "to_repo")
+        repo = GitRepo(target_dir, self.src_repo)
+
+        repo('master')
+        self.assertFalse(os.path.exists(os.path.join(target_dir, 'file_on_branch1')),
+                         'file_on_branch1 should not exist')
+        self.assertFalse(os.path.exists(os.path.join(target_dir, 'file_on_branch2')),
+                         'file_on_branch2 should not exist')
+
+        repo('branch1')
+        self.assertTrue(os.path.exists(os.path.join(target_dir, 'file_on_branch1')),
+                         'file_on_branch1 should exist')
+        self.assertFalse(os.path.exists(os.path.join(target_dir, 'file_on_branch2')),
+                         'file_on_branch2 should not exist')
+
+        repo('branch2')
+        self.assertFalse(os.path.exists(os.path.join(target_dir, 'file_on_branch1')),
+                         'file_on_branch1 should not exist')
+        self.assertTrue(os.path.exists(os.path.join(target_dir, 'file_on_branch2')),
+                        'file_on_branch2 should exist')
+
+    def test_02_merge(self):
+        target_dir = os.path.join(self.dst_dir, "to_repo")
+        repo = GitRepo(target_dir, self.src_repo)
+        repo('master')
+
+        repo.merge('branch1')
+        self.assertTrue(os.path.exists(os.path.join(target_dir, 'file_on_branch1')),
+                        'file_on_branch1 should exist')
+        self.assertFalse(os.path.exists(os.path.join(target_dir, 'file_on_branch2')),
+                        'file_on_branch2 should not exist')
+        repo.merge('branch2')
+        self.assertTrue(os.path.exists(os.path.join(target_dir, 'file_on_branch1')),
+                        'file_on_branch1 should exist')
+        self.assertTrue(os.path.exists(os.path.join(target_dir, 'file_on_branch2')),
+                        'file_on_branch2 should exist')
+
+    def test_03_revert(self):
+        target_dir = os.path.join(self.dst_dir, "to_repo")
+        repo = GitRepo(target_dir, self.src_repo)
+        repo('master')
+
+        repo.merge('branch1')
+        self.assertTrue(os.path.exists(os.path.join(target_dir, 'file_on_branch1')),
+                        'file_on_branch1 should exist')
+
+        repo.revert('master')
+        self.assertFalse(os.path.exists(os.path.join(target_dir, 'file_on_branch1')),
+                         'file_on_branch1 should not exist')
+>>>>>>> MERGE-SOURCE

=== modified file 'doc/conf.py'
--- doc/conf.py	2014-06-16 17:51:34 +0000
+++ doc/conf.py	2014-07-18 23:12:56 +0000
@@ -49,7 +49,11 @@
 # The short X.Y version.
 version = '1.9'
 # The full version, including alpha/beta/rc tags.
+<<<<<<< TREE
 release = '1.9.0-dev'
+=======
+release = '1.8.5-dev'
+>>>>>>> MERGE-SOURCE
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

=== modified file 'doc/configuration.rst'
--- doc/configuration.rst	2014-07-03 22:15:08 +0000
+++ doc/configuration.rst	2014-07-18 23:12:56 +0000
@@ -262,6 +262,7 @@
 :lightweight-checkout: Working copy initialized with the command
                        ``bzr checkout --lightweight url ...``
 
+<<<<<<< TREE
 .. _merges:
 
 merges
@@ -275,6 +276,20 @@
 
 .. note:: new in version 1.9.0
 
+=======
+.. _merges:
+
+merges
+------
+Specify which VCS branches need to be merged into repositories
+specified under :ref:`addons` or :ref:`version`. The syntax is
+the same as for repositories specified under these directives.
+
+Currently only merges on bzr repositories are supported.
+
+.. note:: new in version 1.9.0
+
+>>>>>>> MERGE-SOURCE
 .. _eggs:
 
 eggs