[SM-Commit] GIT changes to master grimoire by Florian Franzmann (270599b4c4ffac4b97655703f67220812bac9a9a)
flux at sourcemage.org
Tue Apr 5 19:08:21 EDT 2011
Ladislav Hagara (ladislav.hagara at unob.cz) wrote [11.04.06 07:40]:
> > GIT changes to master grimoire by Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>:
> > FUNCTIONS | 103 -------------------------------------
> > x11-libs/fontconfig/BUILD | 1
> > 39 files changed, 266 insertions(+), 245 deletions(-)
> > New commits:
> > commit b26a6512202be97213e75394be42583a917bc8c1
> > Author: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
> > Commit: Florian Franzmann <siflfran at hawo.stw.uni-erlangen.de>
> > reverted the mess I made in 871c20ef752652dc2ced179e18841c86c571d47d
> How did you reverted it?
> I just run "git log" and trying to find if all is OK.
> By " git diff 693d9da6b042cbbd07f409adf264f0216eedeff9
> 676194ff047cdd5484e42a37bcbf93a0607f59cd" I get that openal-soft was
> update to 1.13 without HISTORY file.
> Your first commit 871c20ef752652dc2ced179e18841c86c571d47d updated also
> openal-soft. Try "git show 871c20ef752652dc2ced179e18841c86c571d47d |
> grep openal-soft".
> Your fix, commit b26a6512202be97213e75394be42583a917bc8c1, didn't
> reverted openal-soft. Try "git show
> b26a6512202be97213e75394be42583a917bc8c1| grep openal-soft".
> Did you reverted it manually?
> Ladislav Hagara
The problem is that the revert is a revert plus a new merge. Florian,
please run git status and git diff --cached before running git commit to
be sure of what you are committing, and also run git whatchanged and git
show after committing before you push. Are you making sure your working
directory is up-to-date before you do your own commits? You might want
to look into using git stash if your working directory is dirty before
doing git pull, or just always do your work in topic branches and pull
them in after updating the master branch, to avoid having all these
Justin "flux_control" Boffemmyer
Cauldron wizard and general mage
Source Mage GNU/Linux
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Size: 490 bytes
Desc: not available
Url : http://lists.ibiblio.org/pipermail/sm-commit/attachments/20110406/4a1c8bbb/attachment.bin
More information about the SM-Commit