The Wayback Machine - https://web.archive.org/web/20200528104741/https://github.com/PaddlePaddle/Paddle/issues/250
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.

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

Switch to Git branching model #250

Closed
wangkuiyi opened this issue Oct 26, 2016 · 9 comments
Closed

Switch to Git branching model #250

wangkuiyi opened this issue Oct 26, 2016 · 9 comments
Assignees
Labels
Bug
Milestone

Comments

@wangkuiyi
Copy link
Collaborator

@wangkuiyi wangkuiyi commented Oct 26, 2016

@reyoung
Copy link
Collaborator

@reyoung reyoung commented Oct 26, 2016

https://github.com/nvie/gitflow command line tools

@reyoung
Copy link
Collaborator

@reyoung reyoung commented Oct 28, 2016

Update docs with #275 . Done.

@reyoung reyoung closed this Oct 28, 2016
@wangkuiyi
Copy link
Collaborator Author

@wangkuiyi wangkuiyi commented Oct 31, 2016

#275 说明的内容看上去并没有解决这个issue。

如果转换成了新的git branching model,那么 master branch 里应该只包含 release commits。但是我在 Network 页面里看到的是 master branch 里有很多各种各样的 commits。

我前天成功地把一个只有一个主干的开源项目 Sextant 变成了双主干。我发现其中有不少坑,需要注意的。我把我的做法详细地描述在这篇wiki里了。供参考。

@wangkuiyi wangkuiyi reopened this Oct 31, 2016
@reyoung
Copy link
Collaborator

@reyoung reyoung commented Nov 1, 2016

重写已经被广泛fork的版本库的历史是一件非常有风险的事情。因为本质上只能重新中央版本库的历史,而其他fork的commits便会成为没有主线的commits。所以,感觉似乎不应该删除旧的master分支。

如果有新的release的话,就在master分支之后再加新的commit吧

@reyoung
Copy link
Collaborator

@reyoung reyoung commented Nov 1, 2016

另外,paddle的release不只是tag,还有同时发布的二进制。所以,如果把master先删掉,所有的二进制是否还会存在。这个也是个问题。

@wangkuiyi
Copy link
Collaborator Author

@wangkuiyi wangkuiyi commented Nov 1, 2016

binary应该是根据git commit生成的吧。如果是这样,那么因为删除branch并不会删除commits,所以所有的binaries还是有效的。

On Oct 31, 2016, at 5:24 PM, Yu Yang notifications@github.com wrote:

另外,paddle的release不只是tag,还有同时发布的二进制。所以,如果把master先删掉,所有的二进制是否还会存在。这个也是个问题。


You are receiving this because you modified the open/close state.
Reply to this email directly, view it on GitHub #250 (comment), or mute the thread https://github.com/notifications/unsubscribe-auth/ABeh52r9NjeO3ykPopkzM4TlLqoQZmLpks5q5oa5gaJpZM4KgxMI.

@wangkuiyi
Copy link
Collaborator Author

@wangkuiyi wangkuiyi commented Nov 1, 2016

这个工作和fork没有关系。已经产生的forks是被用在未来的开发里的,所以不受“篡改历史”的影响。未来新的fork会包含“篡改过的历史”。

@reyoung
Copy link
Collaborator

@reyoung reyoung commented Nov 2, 2016

@wangkuiyi Done. There just three commits in master network now(init, V0.8.0b0, V0.8.0b1)

https://github.com/baidu/Paddle/network

Although I use a slightly different way to do it. I just checkout an orphan branch, create a new root commit with some empty file (.gitignore, README.md), and merge each tags to this branch.

Also rewrite the commit time to make github network more pretty.

@wangkuiyi
Copy link
Collaborator Author

@wangkuiyi wangkuiyi commented Nov 2, 2016

This is awesome! Thanks! @reyoung

Although it seems more reasonable to make the master branch starting from the initial commit other than an orphan commit, e.g., https://github.com/k8sp/sextant/network, but your fix fits what the auto rollout/rollback mechanism wants, thus I like it as much as the other way.

@wangkuiyi wangkuiyi closed this Nov 2, 2016
zhhsplendid pushed a commit to zhhsplendid/Paddle that referenced this issue Sep 25, 2019
…-lookup-table

add doc for distribute lookup table
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants
You can’t perform that action at this time.