IMP-dev

imp-dev@salilab.org

869 discussions

Please make sure you clean up commits before pushing to github/develop
by Daniel Russel 22 Apr '13

22 Apr '13

Part of the point of git is that you can commit and share patches without pushing them to the main branch and so can make sure things are clean before you do. Specifically - make sure there are no commits adding README.md files to the root directory - make sure there are no "Merge " commits in the history. You can use git log to look for such commits and git rebase -i HEAD~some_number To edit the last some_number of branches (to delete them clean up the commit messages, merge branches).

1 1

Shall we declare it a release?
by Daniel Russel 21 Apr '13

21 Apr '13

The only issue that is in the release milestone relates to the web pages. Say by 5pm?

4 16

link on working with remote vs. local git repository
by Barak Raveh 19 Apr '13

19 Apr '13

the biggest conceptual difference between git and svn is that in git, your repository is local. So when you commit, your commit is private - nobody else knows about it. In order to synchronize with everybody else, you need to 'push' to the remote repository The following link gives a pretty good explanation about working with remote repositories: http://git-scm.com/book/en/Git-Branching-Remote-Branches -- Barak

1 0

IMPORTANT - decide whether to work on master vs. develop IMP version
by Barak Raveh 19 Apr '13

19 Apr '13

Dear all (Max, Riccardo, Natalia - this might be particularly important for you) As we approach the next release, it is *critical* that each person in the group will make a clear personal decision whether they want to work in the "develop" branch or the "master" branch (= release version) of IMP. Note that this has nothing to do with whether you are considered an IMP developer or not, it is just a technical personal decision. The *develop* branch is where we work on developing the next release. In 6 months, this will be the next IMP. It is less stable (but should be much much more stable than it used to as the testing system improves more and more). It contains the newest IMP features and updates. Also, you enjoy the daily testing system, so you can be assured your code will be compatible with the next IMP release. The *master* branch is the release version - it means you will be frozen with a relatively stable version of IMP, with minor bug updates from time to time, but will not get new features. All your code changes will be kept for you, and will not be easily shared with all other developers. Also, you will not enjoy the daily testing system (so you won't know if your code is stable for the next release). Feel free to ask questions or give feedback, this decision is totally up to you. You can switch in the middle, but it might be a bit of a mess as the two branches will diverge over time.

5 7

github documentation page
by Barak Raveh 19 Apr '13

19 Apr '13

Mainly to Yannick and Daniel - I added some description of the 'develop' vs. 'master' choice to https://github.com/salilab/imp/wiki/Getting-started-as-a-developer. I put the graph part only for 'develop' users, do you think that makes sense? Or should we say the graph is the way to go for both?

1 0

git commit model addition
by Yannick SPILL 18 Apr '13

18 Apr '13

Hi there I've added something graphical to make things clearer to what Daniel has been writing in the wiki. For now, it's in a separate page https://github.com/salilab/imp/wiki/Y%27s-addition but I think it needs to be merged with these two pages https://github.com/salilab/imp/wiki/Getting-started-as-a-developer https://github.com/salilab/imp/wiki/A-proposed-commit-model-for-IMP attached, you will find the graph, which I didn't know how to include in github. comments welcome! Y

2 1

No more commits to svn
by Daniel Russel 18 Apr '13

18 Apr '13

Just a reminder. Nothing more is being automatically synced from svn to git.

2 1

git repo now OK
by Daniel Russel 18 Apr '13

18 Apr '13

Except for the kinematics feature branch that I am still cleaning.

1 0

Git repo still down
by Daniel Russel 18 Apr '13

18 Apr '13

I thought I sent an email, but I'm not seeing it in my sent mail. Things should be ok by 11.

1 0

Preparation for release 1: Trying out git
by Daniel Russel 18 Apr '13

18 Apr '13

As part of the upcoming release, we would like to switch over completely to git as it simplifies branch management a lot. As preparation for that, it would be nice if people try it out in their working setup a bit. To check out imp with git do - get the code `git clone https://github.com/salilab/imp.git` - setup things `./setup_git.sh` Git may instruct you to set up your email address and name, if so, follow its instructions. That will give you a repository that has the current state of the release candidate (which, for the time being is synced with svn). You then use it just like an svn checkout for building IMP. We can talk about committing things later. When you want to update do `git pull origin master`

4 9

← Newer
1
...
9
10
11
12
13
14
15
...
87
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

IMP-dev