Re: commit: Fix specifier inheritance behavior
"Stephen J. Turnbull" <turnbull(a)sk.tsukuba.ac.jp> writes:
Michael Sperber writes:
>
> "Stephen J. Turnbull" <stephen(a)xemacs.org> writes:
>
> > (1) I don't want to see merge turds. The commit bot should be diffing
> > against the parent of the commit, not against the previous revision.
> > They're typically different in the case of merges.
>
> I guess I still don't understand what you're trying to accomplish: A
> merge commit has *two* parents.
The problem I'm worried about now is not the merge, it's the commit
that creates a new head, which requires a merge or you can't push.
I'm confused even more: I thought we're talking about the *commit bot*,
not your local setup.
hg diff -r`hg log -r REV --template='{parents}\n'` -r REV
Yeah, well, it can be refined to work for non-merge commits: My question
was whether it's what you want to see for merge commits.
--
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches