Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix: ARSN-191 fix wrong notification type when master version is d… #1866

Merged
merged 1 commit into from
May 13, 2022
Merged

bugfix: ARSN-191 fix wrong notification type when master version is d… #1866

merged 1 commit into from
May 13, 2022

Conversation

Kerkesni
Copy link
Contributor

@Kerkesni Kerkesni commented May 4, 2022 •
edited
Loading

…eleted

Ticket: ARSN-191

Issue:
When the last version of an object is deleted, the master gets updated with the metadata of the new last version of the object. The originOp is kept the same during this update, however it should be updated into a "delete operation"

@bert-e
Copy link
Contributor

bert-e commented May 4, 2022

Hello kerkesni,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented May 4, 2022

Branches have diverged

This pull request's source branch bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted has diverged from
development/8.1 by more than 50 commits.

To avoid any integration risks, please re-synchronize them using one of the
following solutions:

  • Merge origin/development/8.1 into bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted
  • Rebase bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted onto origin/development/8.1

Note: If you choose to rebase, you may have to ask me to rebuild
integration branches using the reset command.

@Kerkesni Kerkesni changed the base branch from development/8.1 to development/7.10 May 4, 2022 16:23
@bert-e
Copy link
Contributor

bert-e commented May 4, 2022

Incorrect fix version

The Fix Version/s in issue ARSN-191 contains:

  • 7.10.22

  • 8.1.44

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.23

  • 8.1.45

Please check the Fix Version/s of ARSN-191, or the target
branch of this pull request.

@bert-e
Copy link
Contributor

bert-e commented May 5, 2022

Incorrect fix version

The Fix Version/s in issue ARSN-191 contains:

  • 7.10.22

  • 8.1.44

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.24

  • 8.1.46

Please check the Fix Version/s of ARSN-191, or the target
branch of this pull request.

@Kerkesni Kerkesni force-pushed the bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted branch from 3007650 to a08d064 Compare May 5, 2022 15:28
@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

Incorrect fix version

The Fix Version/s in issue ARSN-191 contains:

  • 7.10.24

  • 8.1.46

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.25

  • 8.1.48

Please check the Fix Version/s of ARSN-191, or the target
branch of this pull request.

@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

Incorrect fix version

The Fix Version/s in issue ARSN-191 contains:

  • 7.10.24

  • 8.1.48

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.25

  • 8.1.48

Please check the Fix Version/s of ARSN-191, or the target
branch of this pull request.

@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

Incorrect fix version

The Fix Version/s in issue ARSN-191 contains:

  • 7.10.24

  • 8.1.49

Considering where you are trying to merge, I ignored possible hotfix versions and I expected to find:

  • 7.10.25

  • 8.1.49

Please check the Fix Version/s of ARSN-191, or the target
branch of this pull request.

@Kerkesni Kerkesni force-pushed the bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted branch from a08d064 to 023857a Compare May 13, 2022 14:01
@bert-e bert-e mentioned this pull request May 13, 2022
Closed
@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@Kerkesni Kerkesni force-pushed the bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted branch from 023857a to 43a8772 Compare May 13, 2022 14:06
@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

History mismatch

Merge commit #023857a26d0f0f391381c5574105167b24fdf5c4 on the integration branch
w/8.1/bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted is merging a branch which is neither the current
branch bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted nor the development branch
development/8.1.

It is likely due to a rebase of the branch bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

@Kerkesni
Copy link
Contributor Author

/reset

@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

Reset complete

I have successfully deleted this pull request's integration branches.

@bert-e bert-e mentioned this pull request May 13, 2022
Merged
@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

Integration data created

I have created the integration data for the additional destination branches.

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

Follow integration pull requests if you would like to be notified of
build statuses by email.

@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • 2 peers

@Kerkesni
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/7.10

  • ✔️ development/8.1

The following branches will NOT be impacted:

  • development/6.4
  • development/7.4

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 13, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/7.10

  • ✔️ development/8.1

The following branches have NOT changed:

  • development/6.4
  • development/7.4

Please check the status of the associated issue ARSN-191.

Goodbye kerkesni.

@bert-e bert-e merged commit bd970c6 into development/7.10 May 13, 2022
@bert-e bert-e deleted the bugfix/ARSN-191-getting-wrong-notification-type-when-master-version-deleted branch May 13, 2022 14:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jbertran jbertran jbertran approved these changes

@francoisferrand francoisferrand francoisferrand approved these changes

@williamlardier williamlardier williamlardier approved these changes

@miniscruff miniscruff Awaiting requested review from miniscruff

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Kerkesni @bert-e @jbertran @francoisferrand @williamlardier