Mailing-List: contact dev-help@flex.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@flex.apache.org
Received-SPF: pass (athena.apache.org: domain of omuppi1@gmail.com designates
 209.85.128.177 as permitted sender)
MIME-Version: 1.0
Sender: omuppi1@gmail.com
In-Reply-To: <EBDD67C6-13B3-4E63-B426-EB2A994A5177@classsoftware.com>
References: <6cd4ad219d6b40968ea579a30bac44e8@git.apache.org>
 <6c95eab30a9c4df9801b860c31963a3e@git.apache.org>
 <FA0C5082-6796-4E47-9E02-568F531211B5@classsoftware.com>
 <CAPxJ8xt-Rf5JKiZ6_CK9xKb+8Gq9CNiaZzt-Y5SYTVQ=wCxEsw@mail.gmail.com>
 <EBDD67C6-13B3-4E63-B426-EB2A994A5177@classsoftware.com>
From: OmPrakash Muppirala <bigosmallm@gmail.com>
Date: Tue, 7 May 2013 17:28:36 -0700
Message-ID: 
 <CACK5iZcSq2oTnD4YAm7a2A7W5ckr765wjg2eT9iXyjbSHVMk4w@mail.gmail.com>
Subject: Re: [2/7] git commit: [flex-sdk] [refs/heads/develop] - Merge branch
 'develop' of https://git-wip-us.apache.org/repos/asf/flex-sdk into develop
To: dev@flex.apache.org
Content-Type: multipart/alternative; boundary=20cf307f35228acc8e04dc2a057e

--20cf307f35228acc8e04dc2a057e
Content-Type: text/plain; charset=ISO-8859-1

On Tue, May 7, 2013 at 5:23 PM, Justin Mclean <justin@classsoftware.com>wrote:

> Hi,
>
> > I get the impression he pulled the updates from origin then merged his
> > changes which kept his timeline when he last pulled.
> Which wouldn't produce this result I believe.
>
> >  So it's showing everybody's commits merged into his develop since then?
> Makes it very hard to see what has actually changed.
>
> Justin
>


This is expected with pull+merge.  Justin, why do you think something went
badly wrong?

In my log view, I see two set of diffs - 'Diff with parent 1' and 'Diff
with parent 2'.  Diff with parent 2 shows the relevant changes by Gordon.

Thanks,
Om

--20cf307f35228acc8e04dc2a057e--