Bug 21418 – resolve-ChangeLogs should have a --continue option which does git rebase --continue

• Component: Tools / Tests
• Status: RESOLVED FIXED

[Eric Seidel (no email)]

resolve-ChangeLogs should have a --continue option which does git rebase --continue

The name is debateable.  But I find myself doing this:

resolve-ChangeLogs WebCore/ChangeLog LayoutTests/ChangeLog && git rebase --continue

*all the time*

[David Kilzer (:ddkilzer)]

(In reply to comment #0)
> *all the time*

I've never done this.  Can you describe the process in which this happens?

Obviously you're doing some kind of a git-rebase operation, but I'm curious if you're preventing git from merging (because it screws it up; see Bug 21457) or because it's constantly getting merge conflicts on ChangeLog files during the rebase operation.

[David Kilzer (:ddkilzer)]

Created attachment 30255 [details]
Patch v1

[Eric Seidel (no email)]

Yay!  sooo excited!

[David Kilzer (:ddkilzer)]

$ git svn dcommit
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebKitTools/ChangeLog
	M	WebKitTools/Scripts/resolve-ChangeLogs
Committed r43601

http://trac.webkit.org/changeset/43601

[David Kilzer (:ddkilzer)]

Follow-up fix for Subversion users:

$ git svn dcommit
Committing to http://svn.webkit.org/repository/webkit/trunk ...
	M	WebKitTools/ChangeLog
	M	WebKitTools/Scripts/resolve-ChangeLogs
Committed r43636

http://trac.webkit.org/changeset/43636

[Dimitri Glazkov (Google)]

Gorgeous. I hugs you.

[Eric Seidel (no email)]

Hum... looks like it somehow confused vim for me today:

eseidel-mac [6520:WebKit]% resolve-ChangeLogs -c                                                                        [~/Projects/WebKit]

M       WebCore/ChangeLog
Running 'git rebase --continue'...
Vim: Warning: Output is not to a terminal

And the terminal is hung. ;)

[Eric Seidel (no email)]

Yup.  Turns out if git rebase --continue needs to open up a vim window, resolve-ChangeLogs -c hangs. :(  I'll file a bug.