Skip to content

Fix the issue 'branch already exist' in rebuilds#3692

Merged
lguohan merged 1 commit intosonic-net:masterfrom
pavel-shirshov:pavelsh/fix_frr_makefile
Nov 4, 2019
Merged

Fix the issue 'branch already exist' in rebuilds#3692
lguohan merged 1 commit intosonic-net:masterfrom
pavel-shirshov:pavelsh/fix_frr_makefile

Conversation

@pavel-shirshov
Copy link
Copy Markdown
Contributor

@pavel-shirshov pavel-shirshov commented Oct 31, 2019

- What I did
Fixed Makefile of FRR. Before we had issues after #3589:

  1. When you want to rebuild frr with new changes you get error "branch frr/7.1 is already exist".
  2. When your patch list is empty stg undo gives an error

- How I did it

  1. checkout to master branch after build.
  2. Using temporary stg branch with timestamp
  3. ignoring result code of stg undo

- How to verify it
make target/debs/stretch/frr_7.1-sonic-0_amd64.deb must work for you first
then
make target/debs/stretch/frr_7.1-sonic-0_amd64.deb-clean and
make target/debs/stretch/frr_7.1-sonic-0_amd64.deb must work for you again

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@lguohan lguohan merged commit d85777b into sonic-net:master Nov 4, 2019
mssonicbld added a commit that referenced this pull request Jun 8, 2025
…lly (#22883)

#### Why I did it
src/sonic-swss
```
* c238a52a - (HEAD -> 202411, origin/202411) Fix indentation in template file (#3694) (22 hours ago) [mssonicbld]
* b12c1285 - [202411][test_mux] fix vstest multi-mux (#3692) (25 hours ago) [Nikola Dancejic]
```
#### How I did it
#### How to verify it
#### Description for the changelog
vmittal-msft pushed a commit to vmittal-msft/sonic-buildimage that referenced this pull request Oct 20, 2025
…tomatically (sonic-net#1215)

#### Why I did it
src/sonic-swss
```
* f7f2195 - (HEAD -> 202503, origin/202503) Merge pull request sonic-net#91 from mssonicbld/sonicbld/202503-merge (21 hours ago) [mssonicbld]
* f9484a3 - Merge branch '202412' of https://github.com/Azure/sonic-swss.msft into 202503 (23 hours ago) [Sonic Automation]
* d654b6c - Merge pull request sonic-net#88 from mssonicbld/sonicbld/202412-merge (2 days ago) [mssonicbld]
* e22738e - Merge branch '202411' of https://github.com/sonic-net/sonic-swss into 202412 (2 days ago) [Sonic Automation]
* b12c128 - [202411][test_mux] fix vstest multi-mux (sonic-net#3692) (2 days ago) [Nikola Dancejic]
```
#### How I did it
#### How to verify it
#### Description for the changelog
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants