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

Floating vs. Fixed based on GitFlow #249

Open
danielmarbach opened this issue Dec 5, 2013 · 3 comments
Open

Floating vs. Fixed based on GitFlow #249

danielmarbach opened this issue Dec 5, 2013 · 3 comments

Comments

@danielmarbach
Copy link

I had to chance to talk to @jeremydmiller in RL. I'm honored. Here is the summary of the idea I gave him during a tube ride:

It would be extremely helpful if ripple could detect based on the GitFlow on what branch you are and then automatically fix all the dependencies. I would suggest the following model:

  • Treat fixed dependencies always as fixed no matter on which branch you are.
  • For develop branch floating dependencies remain floating.
  • When you merge on master/release-* or any other considered stable branch ripple could turn the floating dependencies into fixed. With that approach when I checkout a release branch some time later to do a bug fix and don't run into the risk of ripple downloading the newest version of some dependency which might be incompatible with my source code written at the time of creating the release branch.

GitFlow
http://nvie.com/posts/a-successful-git-branching-model/

Here is code that shows how to use libgit to detect on which branch you are running.

https://github.com/Particular/GitFlowVersion

Thoughts?

@andreasohlund
Copy link
Contributor

We're already doing that:

https://github.com/Particular/ripple/commit/b859f22fef6048f8bf5d4a18e2adbd6895be401b

(that's a hack though)

Here is the issue for it:

#123

On Thu, Dec 5, 2013 at 8:39 AM, danielmarbach [email protected]:

I had to chance to talk to @jeremydmillerhttps://github.com/jeremydmillerin RL. I'm honored. Here is the summary of the idea I gave him during a
tube ride:

It would be extremely helpful if ripple could detect based on the GitFlow
on what branch you are and then automatically fix all the dependencies. I
would suggest the following model:

  • Treat fixed dependencies always as fixed no matter on which branch
    you are.
  • For develop branch floating dependencies remain floating.
  • When you merge on master/release-* or any other considered stable
    branch ripple could turn the floating dependencies into fixed. With that
    approach when I checkout a release branch some time later to do a bug fix
    and don't run into the risk of ripple downloading the newest version of
    some dependency which might be incompatible with my source code written at
    the time of creating the release branch.

GitFlow
http://nvie.com/posts/a-successful-git-branching-model/

Here is code that shows how to use libgit to detect on which branch you
are running.

https://github.com/Particular/GitFlowVersion

Thoughts?


Reply to this email directly or view it on GitHubhttps://github.com//issues/249
.

@danielmarbach
Copy link
Author

As usual you are way ahead of me!

Am 05.12.2013 um 07:42 schrieb Andreas Öhlund [email protected]:

We're already doing that:

https://github.com/Particular/ripple/commit/b859f22fef6048f8bf5d4a18e2adbd6895be401b

(that's a hack though)

Here is the issue for it:

#123

On Thu, Dec 5, 2013 at 8:39 AM, danielmarbach [email protected]:

I had to chance to talk to @jeremydmillerhttps://github.com/jeremydmillerin RL. I'm honored. Here is the summary of the idea I gave him during a
tube ride:

It would be extremely helpful if ripple could detect based on the GitFlow
on what branch you are and then automatically fix all the dependencies. I
would suggest the following model:

  • Treat fixed dependencies always as fixed no matter on which branch
    you are.
  • For develop branch floating dependencies remain floating.
  • When you merge on master/release-* or any other considered stable
    branch ripple could turn the floating dependencies into fixed. With that
    approach when I checkout a release branch some time later to do a bug fix
    and don't run into the risk of ripple downloading the newest version of
    some dependency which might be incompatible with my source code written at
    the time of creating the release branch.

GitFlow
http://nvie.com/posts/a-successful-git-branching-model/

Here is code that shows how to use libgit to detect on which branch you
are running.

https://github.com/Particular/GitFlowVersion

Thoughts?


Reply to this email directly or view it on GitHubhttps://github.com//issues/249
.


Reply to this email directly or view it on GitHub.

@andreasohlund
Copy link
Contributor

And I can add that the "concept" works flawlessly.

On Thu, Dec 5, 2013 at 9:44 AM, danielmarbach [email protected]:

As usual you are way ahead of me!

Am 05.12.2013 um 07:42 schrieb Andreas Öhlund [email protected]:

We're already doing that:

https://github.com/Particular/ripple/commit/b859f22fef6048f8bf5d4a18e2adbd6895be401b

(that's a hack though)

Here is the issue for it:

#123

On Thu, Dec 5, 2013 at 8:39 AM, danielmarbach [email protected]:

I had to chance to talk to @jeremydmiller<
https://github.com/jeremydmiller>in RL. I'm honored. Here is the summary
of the idea I gave him during a
tube ride:

It would be extremely helpful if ripple could detect based on the
GitFlow
on what branch you are and then automatically fix all the
dependencies. I
would suggest the following model:

  • Treat fixed dependencies always as fixed no matter on which branch
    you are.
  • For develop branch floating dependencies remain floating.
  • When you merge on master/release-* or any other considered stable
    branch ripple could turn the floating dependencies into fixed. With
    that
    approach when I checkout a release branch some time later to do a bug
    fix
    and don't run into the risk of ripple downloading the newest version
    of
    some dependency which might be incompatible with my source code
    written at
    the time of creating the release branch.

GitFlow
http://nvie.com/posts/a-successful-git-branching-model/

Here is code that shows how to use libgit to detect on which branch
you
are running.

https://github.com/Particular/GitFlowVersion

Thoughts?


Reply to this email directly or view it on GitHub<
https://github.com/DarthFubuMVC/ripple/issues/249>
.


Reply to this email directly or view it on GitHub.


Reply to this email directly or view it on GitHubhttps://github.com//issues/249#issuecomment-29880289
.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants