Hi Lucas,
I have one request: The current faces branch is a pain somehow, as it
cannot be rebased easily. I would like to do
git checkout faces
git checkout -b faces_work
git rebase master
(I do the same for my comments branch to keep them on top of master).
Since what was committed by you/me 2764e32791 on the faces branch
actually scoops up *ALL* the changes from 2012/09 onward into one
commit, this does not work.
I have now made the merge manually, created *one* commit on top
of current master that implement the faces, and nothing else:
$ git log
commit e04b9d5ab7d425edc9e2449e19a284f7c6dc031e
Author: Norbert Preining <[email protected]>
Date: Thu Jan 24 08:27:33 2013 +0900
Faces tool:
- original patch written by Valentin Barros Puertas
- first submit by Lucas Beeler
- rebasing on head as of 2013/01/22 by Norbert Preining
- converting into single patch for easy rebasing by Norbert Preining
commit cd89cc3da3fcf48701482f33fb2adb0f7481c23c
Author: Joseph Bylund <[email protected]>
Date: Wed Jan 23 13:34:21 2013 -0800
Fixes a build system issue in which the GSchema XML files would not be
properly recompiled. Closes #6178.
....
This patch (git format-patch HEAD^) is available at
http://www.preining.info/0001-Faces-tool.patch
I woulkd suggest, if this is not against the policy of yorba:
- trash the current faces branch (or rename it to faces_old)
- checkout a new faces branch from current master
- git am 0001-Faces-tool.patch
and push the stuff out to your git server.
It will make those people following the faces branch to delete and
recheckout their faces branch, but that is the usual problem with
rebased branches.
>From now on we *could* always do
git merge master
into the faces branch, to keep it uptodate and easily mergeable back
into master.
But also for git merge master we need commits that are only related to
faces, and the big update commit does not play well here.
I hope this is undestandable ...if not, let me know.
Thanks a lot
Norbert
------------------------------------------------------------------------
PREINING, Norbert http://www.preining.info
JAIST, Japan TeX Live & Debian Developer
DSA: 0x09C5B094 fp: 14DF 2E6C 0307 BE6D AD76 A9C0 D2BF 4AA3 09C5 B094
------------------------------------------------------------------------
_______________________________________________
Shotwell mailing list
[email protected]
http://lists.yorba.org/cgi-bin/mailman/listinfo/shotwell
