Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » looking for a good workflow for fly-by changes
looking for a good workflow for fly-by changes [message #717589] Sun, 21 August 2011 14:53 Go to next message
Henrik Lindberg is currently offline Henrik Lindberg
Messages: 2500
Registered: July 2009
Senior Member
Hi,
I am looking for a good workflow for the following case.

Say I am working on fixing a bug on a issue-42 branch. As I am doing
this, I detect javadoc comments, and dead code that should have been
fixed in code that I am looking at.

a) Bureaucratic
I could log an issue and come back to it later. But it is more work to
log this than the work to fix it. Result is most likely yet another
low-priority work item that just lengthens the backlog and triage time.

b) Sloppy
I could just change it and let it be part of my merge of issue-42. This
is less satisfactory, as this change has nothing to do with issue-42.
(One way around this is to commit, but then rebase interactively and
omit commits that are unrelated (and then deal with those later) - but
this is somewhat messy, and seems to much overhead for fixing a spelling
error)).
If Egit had good rebase --interactive I just need to commit the cleanup
with a message that allows me to recognize those commits. Right now,
since I have to switch to command line, this seems too much work for a
spelling error.

c) Fix cleanup on master
I could switch back to the master branch, fix it there, commit, push.
I then need to rebase my issue-42 branch (so I see the changes as I
continue).

d) Fix cleanup in separate branch
I could create a separate branch for cleanup fixes like these. I still
need to rebase my issue-42 branch to the cleanup , but I can deal with
merging all cleanup commits into master as one operation.

In all cases where I have to switch branch, and I am working with a
delta that involves manifest changes, I incur a quite heavy build, which
is not ideal. This also makes me reluctant to fix the spelling error.

Is there some other convenient way of dealing with fly-by changes? What
do you do in these situations?

Regards
- henrik
Re: looking for a good workflow for fly-by changes [message #717756 is a reply to message #717589] Mon, 22 August 2011 09:04 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias Sohn
Messages: 588
Registered: July 2009
Senior Member
If the work on issue-42 isn't committed yet I would just stage the fix for the spelling error and commit that,
somewhen later issue-42 will be committed on top of this. Otherwise I would use another branch for the spelling error. If branch switching triggers a heavy build, I would say you should look into how to improve your build as switching a branch only touches the files different between those two branches.
Re: looking for a good workflow for fly-by changes [message #717850 is a reply to message #717756] Mon, 22 August 2011 13:49 Go to previous message
Henrik Lindberg is currently offline Henrik Lindberg
Messages: 2500
Registered: July 2009
Senior Member
On 8/22/11 11:04 AM, Matthias Sohn wrote:
> If the work on issue-42 isn't committed yet I would just stage the fix
> for the spelling error and commit that,

That is how I have worked up to now.
> somewhen later issue-42 will be committed on top of this. Otherwise I
> would use another branch for the spelling error. If branch switching
> triggers a heavy build, I would say you should look into how to improve
> your build as switching a branch only touches the files different
> between those two branches.

It works very well - it is only when there are changes to bundle
dependencies, extension points etc. that the build is "heavy" (i.e.
takes longer than an instant, it isn't really heavy).

Also, when done while debugging, since everything change, the debugging
has to restart.

I guess that is just how things need to work - no smart way around that...

- henrik
Previous Topic:How to list tags?
Next Topic:Git team provider configuration has gone missing.
Goto Forum:
  


Current Time: Sun Oct 26 00:38:54 GMT 2014

Powered by FUDForum. Page generated in 0.23271 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software