Bitmessage/PyBitmessage-2024-12-22
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 52 Actions Packages Projects Releases 5 Wiki Activity

Changed copyright year to 2019 #1434

Merged
sandakersmann merged 3 commits from v0.6 into v0.6 2019-03-23 17:17:34 +01:00
Conversation 24 Commits 3 Files Changed 5 +5 -5
sandakersmann commented 2019-02-05 15:22:49 +01:00 (Migrated from github.com)
Copy Link

Changed copyright year to 2019. Also changed start year to 2012 some places since that is what's correct according to Github.

Changed copyright year to 2019. Also changed start year to 2012 some places since that is what's correct according to Github.
g1itch commented 2019-02-05 15:28:40 +01:00 (Migrated from github.com)
Copy Link

No need to change about.ui - year is replaced programmatically there.

No need to change `about.ui` - year is [replaced programmatically](../blob/v0.6/src/bitmessageqt/dialogs.py#L45) there.
sandakersmann commented 2019-02-05 15:34:20 +01:00 (Migrated from github.com)
Copy Link

@g1itch Ok, but is it fine that I change 2013 to 2012 in about.ui?

@g1itch Ok, but is it fine that I change 2013 to 2012 in about.ui?
g1itch commented 2019-02-05 15:38:38 +01:00 (Migrated from github.com)
Copy Link

@g1itch Ok, but is it fine that I change 2013 to 2012 in about.ui?

I don't know because I joined in 2017.

> @g1itch Ok, but is it fine that I change 2013 to 2012 in about.ui? I don't know because I joined in 2017.
sandakersmann commented 2019-02-05 15:42:20 +01:00 (Migrated from github.com)
Copy Link

This guy did commit stuff in 2012: https://github.com/Bitmessage/PyBitmessage/commits?author=maran

I will revert 2019 back to 2017

This guy did commit stuff in 2012: https://github.com/Bitmessage/PyBitmessage/commits?author=maran I will revert 2019 back to 2017
sandakersmann commented 2019-02-05 15:49:51 +01:00 (Migrated from github.com)
Copy Link

@g1itch 2019 is now reverted back to 2017 in about.ui

@g1itch 2019 is now reverted back to 2017 in about.ui
PeterSurda commented 2019-02-05 20:24:10 +01:00 (Migrated from github.com)
Copy Link

I fail to see the point of these changes in copyright dates and am inclined to reject the PR.

I fail to see the point of these changes in copyright dates and am inclined to reject the PR.
sandakersmann commented 2019-02-05 21:29:29 +01:00 (Migrated from github.com)
Copy Link

@PeterSurda If we're not going to update them I think we should completely remove them, but we can't really do that because it would violate the license.

@PeterSurda If we're not going to update them I think we should completely remove them, but we can't really do that because it would violate the license.
PeterSurda commented 2019-02-06 19:59:48 +01:00 (Migrated from github.com)
Copy Link

I think the project should have a policy about this.

I think the project should have a policy about this.
sandakersmann commented 2019-02-07 11:30:23 +01:00 (Migrated from github.com)
Copy Link

Isn't it easier to just merge this once a year?

Isn't it easier to just merge this once a year?
PeterSurda (Migrated from github.com) approved these changes 2019-03-09 22:49:52 +01:00
PeterSurda commented 2019-03-09 22:50:27 +01:00 (Migrated from github.com)
Copy Link

For the time being I think continuing updating the year is ok.

For the time being I think continuing updating the year is ok.
👍 1
PeterSurda commented 2019-03-22 20:19:26 +01:00 (Migrated from github.com)
Copy Link

@sandakersmann you have to rebase the branch so that it can be fast-forward-merged.

@sandakersmann you have to rebase the branch so that it can be fast-forward-merged.
sandakersmann commented 2019-03-23 01:05:49 +01:00 (Migrated from github.com)
Copy Link

Do I do that with: git rebase v0.6 ?

Do I do that with: `git rebase v0.6` ?
PeterSurda commented 2019-03-23 08:35:49 +01:00 (Migrated from github.com)
Copy Link

I think you need to specify upstream as well, and don't forget to sign (if you have autosign in config, that's enough, otherwise you need to specify -s).

I think you need to specify upstream as well, and don't forget to sign (if you have autosign in config, that's enough, otherwise you need to specify `-s`).
sandakersmann commented 2019-03-23 15:20:01 +01:00 (Migrated from github.com)
Copy Link

Not sure if this is correct. If not, I can make a new pull request.

Not sure if this is correct. If not, I can make a new pull request.
PeterSurda commented 2019-03-23 15:38:09 +01:00 (Migrated from github.com)
Copy Link

Looks ok. You should be now able to merge yourself by clicking the green button which says "Merge pull request". If it doesn't work, let me know and @g1itch will do it.

Looks ok. You should be now able to merge yourself by clicking the green button which says "Merge pull request". If it doesn't work, let me know and @g1itch will do it.
sandakersmann commented 2019-03-23 15:51:56 +01:00 (Migrated from github.com)
Copy Link

That button is grayed out for me.

That button is grayed out for me.
PeterSurda commented 2019-03-23 17:17:51 +01:00 (Migrated from github.com)
Copy Link

OK I merged it

OK I merged it
PeterSurda commented 2019-03-23 17:25:30 +01:00 (Migrated from github.com)
Copy Link

Hmm it didn't work fully as I wanted, it doesn't look like a ff-merge, I will work on it better next time.

Hmm it didn't work fully as I wanted, it doesn't look like a ff-merge, I will work on it better next time.
sandakersmann commented 2019-03-23 18:26:56 +01:00 (Migrated from github.com)
Copy Link

Does not look like the programmatically replacing of 2017 in about.ui is working...
Screenshot from 2019-03-23 18-24-32

Does not look like the programmatically replacing of 2017 in `about.ui` is working... ![Screenshot from 2019-03-23 18-24-32](https://user-images.githubusercontent.com/6118832/54869488-3a99be00-4d99-11e9-834e-edd3f4468507.png)
PeterSurda commented 2019-03-23 18:39:28 +01:00 (Migrated from github.com)
Copy Link

Well the screenshot matches the the contents of about.ui, looks like you made a typo.

Well the screenshot matches the the contents of `about.ui`, looks like you made a typo.
sandakersmann commented 2019-03-23 18:49:34 +01:00 (Migrated from github.com)
Copy Link

@g1itch said it was auto updated in this comment:
https://github.com/Bitmessage/PyBitmessage/pull/1434#issuecomment-460657207
That's why I didn't change that.

@g1itch said it was auto updated in this comment: https://github.com/Bitmessage/PyBitmessage/pull/1434#issuecomment-460657207 That's why I didn't change that.
sandakersmann commented 2019-03-23 19:02:41 +01:00 (Migrated from github.com)
Copy Link

Made a new pull to fix this:
https://github.com/Bitmessage/PyBitmessage/pull/1448

Made a new pull to fix this: https://github.com/Bitmessage/PyBitmessage/pull/1448
PeterSurda commented 2019-03-23 20:07:19 +01:00 (Migrated from github.com)
Copy Link

I'll have to look at about.ui.

I'll have to look at `about.ui`.
g1itch commented 2019-03-23 21:22:41 +01:00 (Migrated from github.com)
Copy Link

Well, I forgot to mention that substitution works only for git repo, not any tarball or release exe file. I hoped you read the code...

Well, I forgot to mention that substitution works only for git repo, not any tarball or release exe file. I hoped you read the code...
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
PeterSurda
Labels
Clear labels   
bug

Something isn't working as it's supposed to

  
build

Related to building or build system

  
dependencies

Pull requests that update a dependency file

  
developers

The issue is relevant mainly for developers rather than users

  
documentation

   
duplicate

   
enhancement

New feature

  
formatting

Code or UI text formatting

  
invalid

   
legal

   
mobile

Frontend for mobile devices (kivy)

  
obsolete

   
packaging

   
performance

   
protocol

Protocol change

  
question

   
refactoring

   
regression

Some issue, fixed in the past, appears again

  
security

   
test

   
translation

   
usability

   
wontfix
No Label
bug
build
dependencies
developers
documentation
duplicate
enhancement
formatting
invalid
legal
mobile
obsolete
packaging
performance
protocol
question
refactoring
regression
security
test
translation
usability
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Bitmessage/PyBitmessage-2024-12-22#1434
No description provided.
Delete Branch "v0.6"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?