On Sun, 9 Sep 2012, Marcin Cieslak wrote:
> On Sun, 9 Sep 2012, Jon Trulson wrote:
>
> > I wouldn't think so, since this is how it's been working from the
> > beginning...
>
> >From the very beginning merged commits where always different
> from my commits, but that didn't matter much since I was working
> on a different branch by parent IDs were different. Now, once
> I switched to work only on master *and* taking into account
> that no other commits slipped in between, my commit *should*
> be the same in my master and your master.
>
> > One possibility:
> >
> > [apply]
> > whitespace = fix
>
> No, since the when doing "git diff" between those the output is empty.
> So that means some commit metadata are different - a parent commit,
> date, email addresses.
>
Tree?
[...]
> > What two 'new' commits were created?
>
> commit 1e4e442df186df4e5319f7bd31b4e8e217dec49a
> Merge: 87ce24f bd70163
> Author: Marcin Cieslak <sa...@saper.info>
> Date: Sun Sep 9 10:57:30 2012 +0200
>
> Merge remote-tracking branch 'origin/master'
>
> commit bd70163b09ff59331bceba9506c7cc51962571f1
> Author: Marcin Cieslak <sa...@saper.info>
> Date: Fri Sep 7 23:04:44 2012 +0200
>
> FreeBSD: Fix dtlogin failsafe session
>
> We need to have /usr/local as the proper
> X11 prefix to start mwm and xterm
>
> and the next one on my master (my original change):
>
> commit 87ce24fc6ae07be01dd3bf9bd1ed569433654803
> Author: Marcin Cieslak <sa...@saper.info>
> Date: Fri Sep 7 23:02:46 2012 +0200
>
> FreeBSD: Fix dtlogin failsafe session
>
> We need to have /usr/local as the proper
> X11 prefix to start mwm and xterm
>
> The common base is:
>
> commit 1a51479e382c29a4859b16e9e1a060c06130bd2d
> Author: Jon Trulson <j...@radscan.com>
> Date: Thu Sep 6 13:33:58 2012 -0600
>
> add HISTORY file
>
>
>
> Looking at the internal structure of the commit
> objects they look like:
How did you get this output?
>
> Commit 87ce24fc6ae07be01dd3bf9bd1ed569433654803:
>
> commit 328tree a879e80682ec2d04d7130c7350c5d63b85066e98
^^^^^^^ ?
> parent 1a51479e382c29a4859b16e9e1a060c06130bd2d
> author Marcin Cieslak <sa...@saper.info> 1347051766 +0200
> committer Marcin Cieslak <sa...@saper.info> 1347051766 +0200
>
> FreeBSD: Fix dtlogin failsafe session
>
> We need to have /usr/local as the proper
> X11 prefix to start mwm and xterm
>
> Commit bd70163b09ff59331bceba9506c7cc51962571f1:
>
> commit 324tree a879e80682ec2d04d7130c7350c5d63b85066e98
^^^^^^^ ?
I am not sure what the significance of this is...
Is it possible that you are seeing two commits - the one I applied to
master, and the one you applied to your dev branch?
Or did you apply the same patch twice (which I don't think is
possible).
I just do not know what the issue is - I haven't done anything
different - aside from creating a tag before your commit. Not sure
why that would affect anything here.
> parent 1a51479e382c29a4859b16e9e1a060c06130bd2d
> author Marcin Cieslak <sa...@saper.info> 1347051884 +0200
> committer Jon Trulson <j...@radscan.com> 1347060772 -0600
>
> FreeBSD: Fix dtlogin failsafe session
>
> We need to have /usr/local as the proper
> X11 prefix to start mwm and xterm
>
>
> So the trees and parents are identifcal, only the date
> and the commiter email address is different.
>
> Looks like things need to be this way in the
> git email patch workflow.
The the need to merge (hence the 'merge' commits) will always happen.
But I have not heard of this particular problem before.
To be clear, a 'git log' shows this commit twice? And this is while
you are on a checked out master?
--
Jon Trulson
Atoms are what make us matter.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
cdesktopenv-devel mailing list
cdesktopenv-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/cdesktopenv-devel
