Merging development branches #1
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The ticgit repository needs to be remote and tracked. In the original repository do something like: 1) ti # to create the ticgit branch 2) git push origin ticgit # to push it to remote 3) git branch -D ticgit 4) git checkout --track -b ticgit origin/ticgit 5) git checkout master # in my case is branch I usually work on 6) use ticgit normally and call 'ti sync' when you want to sync with the remote repository When you colaborate you do something like: 1) git clone git://(...) # clone the repository you want 2) git checkout --trac -b ticgit origin/ticgit 3) git checkout master # in my case is branch I usually work on 4) use ticgit normally and call 'ti sync' when you want to sync with the remote repository
This commit addresses the situation where 'rake setup' fails due to GemInstaller being undefined.
…could just as easily check the git revision history?
…g_merge_pheres
…ust applied a patch but it does not apply cleanly
- bin/ti learned to detect if it was running inside a Git source tree. - bin/ti now automatically prefers the source version of the ticgit library when run from inside the Git tree. - Made path names OS-agnostic within by using File.join instead of hard-coded directory separators.
- Incorporated ticket_title patch from Debian maintainer Michael Schutte. [git://git.debian.org/~michi-guest/ticgit.git @ bcaff2c] - Closes Debian bug 514282. [http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=514282]
Add the ticgit.rb library from the source tree to the front of the load path. This allows ticgitweb to run without first creating and installing a ticgit gem, which is important when testing multiple branches of development.
- bin/ti learned an easier way to prefer the ticgit.rb library in the source tree over an installed gem. - bin/ti now uses same trick as bin/ticgitweb (see commit 253f646).
- Removed optional fields, especially those prone to clobbering between forks. This should make maintaining the gemspec among multiple clones easier. - Added dynamic date. Date will be updated on each rebuild of the gem. - Added dynamic versioning based on seconds since epoch. Version will be incremented on each rebuild of the gem.
|
Sounds great! |
- Rakefile was rewritten to use bundler to handle dependencies. - Gemfile and Gemfile.lock added to support bundler. - Rake now builds the ticgit gem with a simplified ticgit.gemspec that will reduce merge conflicts. - Test task rewritten to use rspec 2.0 instead of 1.3.0. - The RSpec task was simplified, but currently fails to run the tests written for bacon. - Default task is now to build and install a ticgit gem.
- Replaced spec/ directory with the contents from e2a0853 to remove bacon dependencies. - Rake now runs test:spec using RSpec-2. - 27 tests in suite: 3 pending and 3 failing.
- According to the GNU guidelines, AUTHORS is intended for situations where "[t]he following contributions warranted legal paper exchanges with the Free Software Foundation." - Counting contributions by commits is just an exercise in vanity, and doesn't merit special consideration. - A MAINTAINERS, CONTRIBUTORS, or THANKS file could be added in the future, but should be left until the codebase stabilizes.
- Fixed potential race condition in TicGitSpecHelper::setup_new_git_repo between the time a tempfile was created and a same-named directory was created by using the mktmpdir method instead. - Improved clarity of variable name for temporary directory.
|
Already merged :) |
This pull request was closed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm trying to forward-port various patches to your master branch, and have built a special tracking branch for your code. Please review this and future patches, and let's see how much of our trees we can merge together.