rhodecode-enterprise-ce Files · pkgs/patch-beaker-metadata-reuse.diff

git: use force fetch and update for target ref. This solves a case...

git: use force fetch and update for target ref. This solves a case when in PRs a target is force updated and is out of sync. Before we used a pull which --ff-only fails obviosly because two are out of sync. This change uses new logic that resets the target branch according to the source target branch allowing smooth merge simulation.

marcink - - Load All Authors

File last commit:

r2758:23866423 default


                r2784:e8c62649

default

Download file

             patch-beaker-metadata-reuse.diff
        
                    13 lines
            
             | 832 B
            
                | text/x-diff
            
             |
                DiffLexer
            
             / pkgs / patch-beaker-metadata-reuse.diff
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      diff -rup Beaker-1.9.1-orig/beaker/ext/database.py Beaker-1.9.1/beaker/ext/database.py

      --- Beaker-1.9.1-orig/beaker/ext/database.py	2018-05-22 18:22:34.802619619 +0200

      +++ Beaker-1.9.1/beaker/ext/database.py	2018-05-22 17:07:14.048335196 +0200

      @@ -91,7 +91,8 @@ class DatabaseNamespaceManager(OpenResou

                                    sa.Column('created', types.DateTime, nullable=False),

                                    sa.Column('data', types.PickleType, nullable=False),

                                    sa.UniqueConstraint('namespace'),

      -                             schema=schema_name if schema_name else meta.schema

      +                             schema=schema_name if schema_name else meta.schema,

      +                             extend_existing=True

                   )

                   cache.create(checkfirst=True)

                   return cache

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				diff -rup Beaker-1.9.1-orig/beaker/ext/database.py Beaker-1.9.1/beaker/ext/database.py
				--- Beaker-1.9.1-orig/beaker/ext/database.py 2018-05-22 18:22:34.802619619 +0200
				+++ Beaker-1.9.1/beaker/ext/database.py 2018-05-22 17:07:14.048335196 +0200
				@@ -91,7 +91,8 @@ class DatabaseNamespaceManager(OpenResou
				sa.Column('created', types.DateTime, nullable=False),
				sa.Column('data', types.PickleType, nullable=False),
				sa.UniqueConstraint('namespace'),
				- schema=schema_name if schema_name else meta.schema
				+ schema=schema_name if schema_name else meta.schema,
				+ extend_existing=True
				)
				cache.create(checkfirst=True)
				return cache