What I miss in git is a simple way to quickly edit all merge conflicts.
Right now every few days I have this workflow:
git fetch apache
git rebase apache/trunk
... conflicts ...
git status // figure out where the conflicts are
vim .... /<<< n n n n :wq // edit stuff manually
git add .
git rebase --continue
git push hetdiana master:multiconf -f // and push the rebased tree
to my semipublic repo
Some things are a wee bit tricky to do if you do them for the first
time, for example, splitting a commit into smaller parts that make it
easier to fix merge conflicts when something is different in IoC (where
I get most conflicts if I get them)
But git does make certain things easy. For example, you can easily test
stuff in a branch. E.g., it would be very easy for people to test out a
couple patches on real projects to see if problems come up that aren't
caught with the test cases ;)
Tom.
On 07/22/2011 05:11 PM, Howard Lewis Ship wrote:
I wish the git svn integration was slightly better, especially when
attempting to backport fixes.
That being said, using git in any way is preferable to svn. The
ability to create a local branch, do a series of commits to it (all
local), then merge or rebase those commits onto trunk and commit as a
group is terrific. It encourages you to make frequent, small commits
which are easier to understand and, when necessary, merge.
My workflow:
Start in trunk
git svn rebase // pulls down latest changes
git co -Blocal // create a local branch, overwriting any existing local branch
... code, test ....
svn commit -a
... code, test ...
svn commit -a
git co trunk
git svn rebase // Pull down latest changes
git rebase local // Insert local branch changes into trunk
git svn dcommit // SVN commit for each local commit
The only pain in Git is dealing with merges, but (outside of say,
TapestryModule) conflicts are pretty rare.
On Thu, Jul 21, 2011 at 11:59 PM, Igor Drobiazko
<igor.drobia...@gmail.com> wrote:
Would you recommend to use git svn or is it still a pain in the ass?
Is the described approach in this post still valid?
http://tapestryjava.blogspot.com/2010/04/setting-up-committer-access-git-for.html
On Wed, Jul 20, 2011 at 11:30 PM, Howard Lewis Ship<hls...@gmail.com>wrote:
I work in Git, but use "git svn dcommit" to commit back up to SVN.
I've found, though, that when working off trunk, its easier to use SVN
(i.e., to backport fixes). git svn 's support for branches (or at
least, merging/cherry-picking to branches) is buggy ... or at least, I
don't understand it.
On Wed, Jul 20, 2011 at 1:31 PM, Igor Drobiazko
<igor.drobia...@gmail.com> wrote:
Who is using what to commit to Tapestry? If you are using Git to commit
to
Apache's SVN, how do you do it?
--
Best regards,
Igor Drobiazko
http://tapestry5.de
--
Howard M. Lewis Ship
Creator of Apache Tapestry
The source for Tapestry training, mentoring and support. Contact me to
learn how I can get you up and productive in Tapestry fast!
(971) 678-5210
http://howardlewisship.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tapestry.apache.org
For additional commands, e-mail: dev-h...@tapestry.apache.org
--
Best regards,
Igor Drobiazko
http://tapestry5.de
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tapestry.apache.org
For additional commands, e-mail: dev-h...@tapestry.apache.org
