Skip to content
This repository was archived by the owner on Mar 2, 2021. It is now read-only.

NMU PR for 2.4.2-0.1#3

Open
gaudenz wants to merge 5 commits intojbouse-debian:masterfrom
gaudenz:master
Open

NMU PR for 2.4.2-0.1#3
gaudenz wants to merge 5 commits intojbouse-debian:masterfrom
gaudenz:master

Conversation

@gaudenz
Copy link

@gaudenz gaudenz commented Dec 1, 2018

No description provided.

jbouse and others added 5 commits March 7, 2018 10:34
@jbouse
Imported Upstream version 2.4.0
3c4f536
@gaudenz
New upstream version 2.4.2
2495211
@gaudenz
Update upstream source from tag 'upstream/2.4.2'
d2fefd9 
Update to upstream version '2.4.2'
with Debian dir 404f459
@gaudenz
Fix autopkgtests (switch to pytest)
1298794 
This also contains a patch to remove the dependency on pytest-relaxed
which is not packged for Debian and does not work with the latest
upstream version of pytest.

Closes: #904635
@gaudenz
Update changelog for 2.4.2-0.1 release
2fb1548
@jbouse jbouse self-assigned this Dec 1, 2018
@jbouse
Copy link
Member

jbouse commented Dec 1, 2018

It looks from the commit history that you may not have your fork from the latest state... Could you attempt to do a fetch from origin and then rebase your fork against it to be current. I'm seeing one of my commits in your PR. Your other PRs don't appear to have this issue.

@gaudenz
Copy link
Author

gaudenz commented Dec 1, 2018 •
edited
Loading

I was wondering about this too. It's because your update to 2.4.0 did not actually fully merge the upstream branch into the master branch. So when gbp import-orig first updated the upstream branch and then merged it into master this commit was also merged into master. I thinnk this is unavoidable if you want to merge from upstream into master in the future. You have to merge this commit at some point.
You can also see this if you do a git log master..upstream in your repository.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@jbouse jbouse

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@gaudenz @jbouse