all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* Messing with the VC history
@ 2014-11-16  6:17 Óscar Fuentes
  2014-11-16  8:19 ` Achim Gratz
  2014-11-16 15:24 ` Eli Zaretskii
  0 siblings, 2 replies; 23+ messages in thread
From: Óscar Fuentes @ 2014-11-16  6:17 UTC (permalink / raw)
  To: emacs-devel

To welcome my first commit to Emacs, some people complicated the VC
history with unnecessary noise burying the happy event into a
merge-fest.

This is my guess about what happened:

In d409545 I pushed my change to master.

In 9075fcc Stefan merged emacs-24 into his local `master' branch but...

when he tried to push the merge it was rejected because of my change. He
proceeded to pull, a conflict was found on a Changelog file (of course!)
and he resolved it, which created a merge (1a71302). Stefan pushes both
merges to master.

Then on bc5d86f another actor enters (Jay Belanger) that pushes a merge
to master (bc5d86f) with the commit message

"Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs"

I guess that this merge was generated by a `pull'. Now we have a merge
(emacs-24 into master) within a merge (Stefan's) within a merge (Jay's).
This can continue indefinitely, creating an spaghetti-like history graph
that no ultra-wide monitor could display.

IMO we should encourage people to use fetch+rebase instead of `pull',
reserving merges for logically-related changes that comprise multiple
commits.


(I'll not dare to ask why, mysteriously, the emacs-diffs mailing list
abstained from mentioning my commit.)




^ permalink raw reply	[flat|nested] 23+ messages in thread

end of thread, other threads:[~2014-11-22 10:04 UTC | newest]

Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-16  6:17 Messing with the VC history Óscar Fuentes
2014-11-16  8:19 ` Achim Gratz
2014-11-16 15:25   ` Eli Zaretskii
2014-11-16 16:00     ` David Engster
2014-11-17 16:48       ` Eli Zaretskii
2014-11-16 16:33     ` Achim Gratz
2014-11-16 18:13       ` Eli Zaretskii
2014-11-22 10:04         ` Steinar Bang
2014-11-16 15:24 ` Eli Zaretskii
2014-11-16 16:05   ` Óscar Fuentes
2014-11-16 16:21     ` Eli Zaretskii
2014-11-16 23:33     ` Stephen J. Turnbull
2014-11-17  1:31       ` John Yates
2014-11-17  3:23         ` Stephen J. Turnbull
2014-11-18  7:18           ` Lars Brinkhoff
2014-11-18  7:42             ` David Kastrup
2014-11-18  7:53             ` Stephen J. Turnbull
2014-11-18  8:41               ` David Kastrup
2014-11-18 16:47               ` Barry Warsaw
2014-11-18 17:06                 ` Andreas Schwab
2014-11-18 22:30                   ` Stephen J. Turnbull
2014-11-19  2:34                     ` Stefan Monnier
2014-11-17 16:42       ` Eli Zaretskii

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.