Project

General

Profile

Actions

Bug #12128

closed

Rudder branch 4.1 contains code from 4.2

Added by Nicolas CHARLES almost 7 years ago. Updated almost 7 years ago.

Status:
Rejected
Priority:
N/A
Assignee:
-
Category:
-
Target version:
Severity:
UX impact:
User visibility:
Effort required:
Priority:
0
Name check:
Fix check:
Regression:

Description

Rudder 4.1 contains code from 4.2, so it breaks many things

This happened because we didn't had luck (and not atomicity), and our "quality assistant" tried to merge something when at the same time trigger updated the underlying repository, so assistant merged/push not what it was suppose to.

You will need to do exactly:

- either delete repos, clone it back

- or reset each working branch to the new state:

git fetch

git checkout branches/rudder/4.1
git reset --hard origin/branches/rudder/4.1

git checkout branches/rudder/4.2
git reset --hard origin/branches/rudder/4.2

git checkout branches/rudder/4.3
git reset --hard origin/branches/rudder/4.3

git checkout master
git reset --hard origin/master

- or delete your existing branches (4.1, 4.2, 4.3 and master) checkout them anew.

Actions #1

Updated by Nicolas CHARLES almost 7 years ago

Source is

commit 9b33bb1f0f164ce89fb40a7e0d9423b3daf1282e
Merge: d51626d 958bfa0
Author: Normation GIT merger <git@normation.com>
Date:   Thu Feb 15 14:57:07 2018 +0100

    Merge branch 'bug_5931/api_does_not_fail_on_bad_json_pr' into branches/rudder/4.1

Actions #2

Updated by François ARMAND almost 7 years ago

  • Description updated (diff)
  • Status changed from New to Rejected

Writing it as "rejected" because the problem was real but correcting it needed some hardcore git manipulation (and not a real commit).

It is now corrected.

Please update (fetch/pull) all your branches, perhaps some force will be needed.

Actions #3

Updated by François ARMAND almost 7 years ago

  • Description updated (diff)
Actions #4

Updated by François ARMAND almost 7 years ago

  • Description updated (diff)
Actions

Also available in: Atom PDF