Return-Path: 
 <dev-return-13291-apmail-accumulo-dev-archive=accumulo.apache.org@accumulo.apache.org>
X-Original-To: apmail-accumulo-dev-archive@www.apache.org
Delivered-To: apmail-accumulo-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id C53021836D
	for <apmail-accumulo-dev-archive@www.apache.org>;
 Mon, 27 Jul 2015 17:40:22 +0000 (UTC)
Received: (qmail 41896 invoked by uid 500); 27 Jul 2015 17:40:22 -0000
Delivered-To: apmail-accumulo-dev-archive@accumulo.apache.org
Received: (qmail 41853 invoked by uid 500); 27 Jul 2015 17:40:22 -0000
Mailing-List: contact dev-help@accumulo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@accumulo.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@accumulo.apache.org>
List-Post: <mailto:dev@accumulo.apache.org>
List-Id: <dev.accumulo.apache.org>
Reply-To: dev@accumulo.apache.org
Delivered-To: mailing list dev@accumulo.apache.org
Received: (qmail 41842 invoked by uid 99); 27 Jul 2015 17:40:22 -0000
Received: from mail-relay.apache.org (HELO mail-relay.apache.org)
 (140.211.11.15)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2015 17:40:22 +0000
Received: from mail-vn0-f44.google.com (mail-vn0-f44.google.com
 [209.85.216.44])
	by mail-relay.apache.org (ASF Mail Server at mail-relay.apache.org) with
 ESMTPSA id 3D04D1A0325
	for <dev@accumulo.apache.org>; Mon, 27 Jul 2015 17:40:22 +0000 (UTC)
Received: by vnaa140 with SMTP id a140so33665233vna.2
        for <dev@accumulo.apache.org>; Mon, 27 Jul 2015 10:40:21 -0700 (PDT)
MIME-Version: 1.0
X-Received: by 10.52.236.134 with SMTP id uu6mr37062765vdc.45.1438018821351;
 Mon, 27 Jul 2015 10:40:21 -0700 (PDT)
Received: by 10.31.13.66 with HTTP; Mon, 27 Jul 2015 10:40:21 -0700 (PDT)
In-Reply-To: <002001d0c7a3$4d4ec930$e7ec5b90$@etcoleman.com>
References: <9c1f54a2afe04a85a02f87b55b2c5a03@git.apache.org>
	<CAL5zq9YP9R5v9kTEuMH_5GHeDKoiFQpA1tMgPs8-+7=GkQ4=ig@mail.gmail.com>
	<002001d0c7a3$4d4ec930$e7ec5b90$@etcoleman.com>
Date: Mon, 27 Jul 2015 13:40:21 -0400
Message-ID: 
 <CAL5zq9bqeG0c0M3g_YPT5j81djjubHas+1j6Ra-0TY7PkLFerA@mail.gmail.com>
Subject: Re: Git Push Summary
From: Christopher <ctubbsii@apache.org>
To: Accumulo Dev List <dev@accumulo.apache.org>
Content-Type: text/plain; charset=UTF-8

I tried to look at what happened more closely today, but couldn't
quite figure it out. I did complete a merge from the current HEAD of
1.6 to 1.7 (using -sours, after verifying that it was appropriate),
and on to master. This doesn't restore the lost commit that was
previously pushed (b83f88caf), but if others are satisfied, I'm fine
with it how it is now.

Just please try to be careful from now on, and avoid force pushing. If
something was pushed by mistake, please push a reverse commit created
with 'git revert <commit>'.

--
Christopher L Tubbs II
http://gravatar.com/ctubbsii


On Sun, Jul 26, 2015 at 9:02 AM, Ed Coleman <dev1@etcoleman.com> wrote:
> This was an oops in two parts. I was trying to make a push a small change to the docs client section.
>
> My change was refs/heads/1.6 967100dda -> b83f88caf but I mistakenly also ended up committing / pushing changes associated with:
>
>   Merge branch '1.6' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.6
>   Commit: b83f88caf758ee9561d5041cc8d6fac3e6a68f62
>
> Then, the second push (forced) was to unwind these changes by rolling back to 967100dda. 967100dda was committed by Christopher on Friday 17 July. Hope this helps reconstruct if anything was overwritten. Sorry.
>
> Ed Coleman
>
> -----Original Message-----
> From: Christopher [mailto:ctubbsii@apache.org]
> Sent: Sunday, July 26, 2015 2:57 AM
> To: edcoleman@apache.org; Accumulo Dev List <dev@accumulo.apache.org>
> Subject: Fwd: Git Push Summary
>
> This looks like an "oops". We shouldn't be force-pushing anything to our maintenance/development branches. We don't want to lose any history, and we don't want to break forks (unless there's a very good reason, discussed on the list first).
>
> It's probably okay to do this on a feature branch, while it's in progress, but not once it's been merged/pushed to a maintenance branch or master.
>
> If anybody has the specific extra commits that were previously pushed, then overwritten, please restore them by merging them back in to the
> 1.6 branch. If you need help, please ask.
>
> Thanks.
>
> --
> Christopher L Tubbs II
> http://gravatar.com/ctubbsii
>
>
>
> ---------- Forwarded message ----------
> From:  <edcoleman@apache.org>
> Date: Sun, Jul 26, 2015 at 12:29 AM
> Subject: Git Push Summary
> To: commits@accumulo.apache.org
>
>
> Repository: accumulo
> Updated Branches:
>   refs/heads/1.6 b83f88caf -> 967100dda (forced update)
>