##// END OF EJS Templates
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.

File last commit:

r2430:1a62fc94 default
r2784:e8c62649 default
Show More
.hgignore
66 lines | 1.1 KiB | text/plain | TextLexer
project: initial commit
r0 syntax: glob
*.egg
*.egg-info
*.idea
*.orig
*.pyc
*.sqlite-journal
*.swp
*.tox
*.DS_Store*
components: reorganize build pipeline to have nice separation of html/js/css
r703 rhodecode/public/js/src/components/**/*.css
project: initial commit
r0
syntax: regexp
#.filename
^\.settings$
^\.project$
^\.pydevproject$
^\.coverage$
^\.cache.*$
^\.rhodecode$
^rcextensions
hgignore: add .dev as ignored
r2430 ^.dev
project: initial commit
r0 ^._dev
^build/
polymer: introduce webcomponents to rhodecode
r689 ^bower_components/
project: initial commit
r0 ^coverage\.xml$
^data$
Martin Bornhold
dev-env: Add .eggs directory to ignore list.
r481 ^\.eggs/
project: initial commit
r0 ^configs/data$
^dev.ini$
^acceptance_tests/dev.*\.ini$
^dist/
^fabfile.py
^htmlcov
^junit\.xml$
^node_modules/
^pylint.log$
^rcextensions/
^result$
^rhodecode/public/css/style.css$
notifications: use rhodecode-toast for notifications instead of toastr jquery plugin
r699 ^rhodecode/public/css/style-polymer.css$
hgignore: Ignore generated webcomponents
r721 ^rhodecode/public/js/rhodecode-components.html$
project: initial commit
r0 ^rhodecode/public/js/scripts.js$
hgignore: skip rhodecode-components.js generated package.
r1093 ^rhodecode/public/js/rhodecode-components.js$
polymer: slim out the styles and change the flow of initialization to avoid race conditions
r714 ^rhodecode/public/js/src/components/root-styles.gen.html$
hgignore: Ignore generated webcomponents
r721 ^rhodecode/public/js/vendors/webcomponentsjs/
project: initial commit
r0 ^rhodecode\.db$
^rhodecode\.log$
^rhodecode_dev\.log$
^test\.db$
# ac-tests
^acceptance_tests/\.cache.*$
^acceptance_tests/externals
^acceptance_tests/ghostdriver.log$
^acceptance_tests/local(_.+)?\.ini$
# docs
^docs/_build$
^docs/result$
^docs-internal/_build$
# Cythonized things
^rhodecode/.*\.(c|so)$