FubuMvcArchive / ripple

Super charged dependency management with Nuget without the merge hell
http://fubuworld.com/ripple
Other
45 stars 35 forks source link

Floating vs. Fixed based on GitFlow #249

Open danielmarbach opened 10 years ago

danielmarbach commented 10 years ago

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:

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 commented 10 years ago

We're already doing that:

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

(that's a hack though)

Here is the issue for it:

https://github.com/DarthFubuMVC/ripple/issues/123

On Thu, Dec 5, 2013 at 8:39 AM, danielmarbach notifications@github.comwrote:

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/DarthFubuMVC/ripple/issues/249 .

danielmarbach commented 10 years ago

As usual you are way ahead of me!

Am 05.12.2013 um 07:42 schrieb Andreas Öhlund notifications@github.com:

We're already doing that:

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

(that's a hack though)

Here is the issue for it:

https://github.com/DarthFubuMVC/ripple/issues/123

On Thu, Dec 5, 2013 at 8:39 AM, danielmarbach notifications@github.comwrote:

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/DarthFubuMVC/ripple/issues/249 .

— Reply to this email directly or view it on GitHub.

andreasohlund commented 10 years ago

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

On Thu, Dec 5, 2013 at 9:44 AM, danielmarbach notifications@github.comwrote:

As usual you are way ahead of me!

Am 05.12.2013 um 07:42 schrieb Andreas Öhlund notifications@github.com:

We're already doing that:

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

(that's a hack though)

Here is the issue for it:

https://github.com/DarthFubuMVC/ripple/issues/123

On Thu, Dec 5, 2013 at 8:39 AM, danielmarbach notifications@github.comwrote:

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/DarthFubuMVC/ripple/issues/249#issuecomment-29880289 .