Phil Ringnalda (:philor) Reporter
	Description • 12 years ago

Merging's black magic to me, but according to bug 786516 comment 11 the reason several things that were already committed before Monday's reconfig didn't actually happen is because an earlier merge made them look like they'd already been merged when they hadn't.

	Mark Banner (:standard8)
	Comment 1 • 12 years ago

Oh, removing bug 786177 again as that was done manually.

	Rail Aliiev [:rail] Assignee
	Comment 2 • 12 years ago

I inspected the output of "hg diff -r default -r production" and figured out the problematic changesets:

680736f2dc1f
6425c62b2364
680736f2dc1f
02e467e82c33

For every single changesets I ran the following on production:

hg export $c | hg import - ; hg commit -n " Merge $c for reals"

Additionally, 129bbc93bdd2 was landed on production only, I transplated it.

And finally I merged (noop) default -> production.

$ hg diff -r default -r production --stat     
 .hgtags |  34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

\o/