Jan Opacki b22ee233f1 Fix change stuck in SUBMITTED state but actually merged ...

This behavior is caused by submitting a commit that has a tag.
Method MergeUtil.markCleanMerges is used by each merge strategy
to update the status of a change if it was a clean merge. It skips
commits that are identified as accepted and their entire ancestry
chain. If a commit is tagged, method MergeOp.getAlreadyAccepted
identifies it as accepted (even if it is not merged yet).
Fix prevents a commit that is referred by a tag to be included in
alreadyAccepted set. If such commit is already merged then it will
be covered anyway by adding heads to alreadyAccepted.

Add a corresponding test that pushes a commit with a tag

Bug: Issue 600
Change-Id: If00247b809b985eaf60ef5ef09fad0f475fb06b9

2013-08-15 10:30:05 +02:00

.settings

Suppress Eclipse warning "annotation should not be used as a superinterface"

2013-05-10 10:31:19 -07:00

contrib

Merge branch 'stable-2.7'

2013-08-06 11:34:13 -07:00

Documentation

Merge "Add AnyWithBlock prolog function"

2013-08-09 17:22:15 +00:00

gerrit-acceptance-tests

Fix change stuck in SUBMITTED state but actually merged

2013-08-15 10:30:05 +02:00

gerrit-antlr

Update Buck

2013-07-26 18:11:51 -07:00

gerrit-cache-h2

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-common

Merge branch 'stable-2.6' into stable-2.7

2013-08-06 11:33:27 -07:00

gerrit-extension-api

Use ETag and If-None-Match for /detail caching

2013-07-19 15:20:08 -07:00

gerrit-gwtdebug

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-gwtexpui

Unify SideBySide2 header widgets

2013-08-09 16:24:06 -07:00

gerrit-gwtui

Remove 2px padding on the bottom of comment boxes

2013-08-09 22:19:55 -07:00

gerrit-httpd

SideBySide2: Add range to PatchLineComment

2013-08-09 15:09:23 -07:00

gerrit-launcher

Split acceptance tests into one target per test

2013-07-27 11:34:23 -07:00

gerrit-lucene

Push limit term into secondary index queries

2013-08-09 01:14:53 +00:00

gerrit-main

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-openid

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-patch-commonsnet

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-patch-jgit

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-pgm

Fix path used in generated prolog class names

2013-08-06 17:32:43 -07:00

gerrit-plugin-api

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-plugin-archetype

Update URLs for Google Cloud Storage

2013-06-21 11:01:45 -07:00

gerrit-plugin-gwt-archetype

Update URLs for Google Cloud Storage

2013-06-21 11:01:45 -07:00

gerrit-plugin-gwtui

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-plugin-js-archetype

Update URLs for Google Cloud Storage

2013-06-21 11:01:45 -07:00

gerrit-prettify

Merge branch 'stable-2.7'

2013-07-05 18:55:30 -07:00

gerrit-reviewdb

SideBySide2: Add range to PatchLineComment

2013-08-09 15:09:23 -07:00

gerrit-server

Fix change stuck in SUBMITTED state but actually merged

2013-08-15 10:30:05 +02:00

gerrit-solr

Push limit term into secondary index queries

2013-08-09 01:14:53 +00:00

gerrit-sshd

Add start times to tasks displayed by show-queue

2013-08-09 17:40:43 -06:00

gerrit-util-cli

Exclude Guava Maven data and javax sources from Guice JARs

2013-08-06 09:39:50 -07:00

gerrit-util-ssl

Delete Maven based build

2013-05-21 20:28:56 -07:00

gerrit-war

Fix path used in generated prolog class names

2013-08-06 17:32:43 -07:00

lib

Simplify buck based prolog compiler

2013-08-06 18:37:45 -07:00

plugins

Update replication plugin to latest revision

2013-08-01 08:24:29 +09:00

ReleaseNotes

Update 2.8 release notes with recent changes and fixes

2013-08-08 15:35:29 +09:00

tools

download_file: Catch exceptions raised from shutil.copyfile

2013-08-08 10:50:20 +09:00

website/releases

Fix "Access-Control-Allow-Origin"-error on Safari browser

2013-07-12 22:21:07 +02:00

.buckconfig

Rename DEFS files to *.defs

2013-07-30 17:18:33 +00:00

.buckversion

Fix path used in generated prolog class names

2013-08-06 17:32:43 -07:00

.gitignore

Add org.eclipse.ltk.core.refactoring.prefs to .gitignore

2013-07-11 18:02:25 +09:00

.gitmodules

Add helloworld plugin as a git submodule

2013-05-28 16:21:25 +09:00

.pydevproject

Set python version back to 2.6.5 in .pydevproject

2013-05-20 11:36:08 +09:00

BUCK

Add basic init classes of gerrit-pgm again to plugin api

2013-08-06 09:39:50 -07:00

COPYING

Initial project setup of Gerrit 2

2008-11-14 16:59:34 -08:00

INSTALL

Remove Gerrit 1.x to 2.x import tools

2009-03-27 20:20:10 -07:00

SUBMITTING_PATCHES

Update push URL in SUBMITTING_PATCHES

2012-03-29 00:57:14 -04:00

VERSION

Cleanup maven_deploy, maven_install build rules

2013-07-29 14:05:26 -07:00

Description

RETIRED, Gerrit as used by OpenStack

120 MiB