HomePhabricator

Merge branch 'master' of ssh://secure.phabricator.com/diffusion/P

Description

Merge branch 'master' of ssh://secure.phabricator.com/diffusion/P

Details

Provenance
chadAuthored on
chadPushed on Dec 21 2015, 5:48 PM
Differential Revision
D14838: Correct some Pirate translations
Parents
rP75ba2c092647: Correct some Pirate translations
rP424cc3010345: Correct some Pirate translations
Branches
Unknown
Tags
Unknown
Build Status
Buildable 9691
Build 11621: Run Core Tests

Event Timeline

This commit serves as my annual reminder I am just a designer.

Shouldn't Merged Changes list more than 1 parent?

I think this is the graph:

+--- master
V


o <-- This Commit
|\
| \
|  o <-- Actual Changes
| /
|/
o
|
o <-- Nice, Linear Master
|
o <-- So Nice
|
o <-- So Linear
|
...

..so it's correct that "This Commit" only merges one change into master ("Actual Changes").

That is, "merged changes" is all commits reachable from the second parent that aren't reachable from the first parent (or vice versa, I never remember which is which and Git and Mercurial use opposite orders). It's not a list of parents, that's in "Parents" up top (and does list two parents).

Actual graph is clearer:

Screen Shot 2015-12-21 at 10.35.03 AM.png (357×802 px, 74 KB)

"Merged Changes" is perhaps more obvious on a real merge commit like rP7ce84cc27b81a390d4a0d0c224dbc18597d6c1cc.

I think this derp was me landing from webUI, then ended up in a weird state locally.

It's OK, I got to draw ASCII art.

oh... I guess that's more useful than just list of parents.

Empty Commit

This commit is empty and does not affect any paths.