Skip to Content.
Sympa Menu

sm-discuss - Re: [SM-Discuss] git feedback

sm-discuss AT lists.ibiblio.org

Subject: Public SourceMage Discussion List

List archive

Chronological Thread  
  • From: John Harding <johnh AT kuberaconsulting.com>
  • To: sm-discuss AT lists.ibiblio.org
  • Subject: Re: [SM-Discuss] git feedback
  • Date: Sat, 22 Jul 2006 15:11:04 -0500

Jeremy Blosser wrote:
On Jul 22, John Harding [johnh AT kuberaconsulting.com] wrote:
Arwed von Merkatz wrote:
Hi everyone,

we've all been using git for some time now, and I'd like to get a little
feedback. Not so much about specific issues, though you are welcome to
ask about them anyway ;), but more some general feeling like "if we have
to use git, I'll leave smgl development" or "git will lead to world
peace". Technically I think it can do everything we need it to do,
though it'll probably need a few wrapper scripts to make some use-cases
easier.

Works for my limited use cases. I would like to be able to fix the problem I have with it having fatal merges or some such, but that's only in test so far. And, yes, I've installed rcs and yes I've read all the discussions recently but none of it worked for me. None of my problems are serious enough not to do git.

Can you give more info on what problem you're having?
------------------------------------------------------------------------

_______________________________________________
SM-Discuss mailing list
SM-Discuss AT lists.ibiblio.org
http://lists.ibiblio.org/mailman/listinfo/sm-discuss
I get the following at the end of git-pull origin except the list of "needs merge" is at least hundreds if not thousands of lines long:

xfce/terminal/DETAILS: needs merge
xfce/terminal/HISTORY: needs merge
fatal: you need to resolve your current index first
Cannot fast-forward your working tree.
After making sure that you saved anything precious from
$ git diff 58228992498dffab179196a1c5b9dd9b4443ca3b
output, run
$ git reset --hard
to recover.


Following the instructions from the above I do a git reset --hard, followed by git-pull origin which results in the following:


john@iowa1000:~/git/grimoire/main$ git-pull origin
Trying really trivial in-index merge...
fatal: Merge requires file-level merging
Nope.
Merging HEAD with 72fee73c6b6665dff34b0bdfc6552e1a83711d42
Merging:
d6c30c062e2973ab81fa28688e37d00389498074 yafray 0.0.9
72fee73c6b6665dff34b0bdfc6552e1a83711d42 centericq: security fix, bug 12602
found 1 common ancestor(s):
84d8b510ac289af0a43bfa9e110844af27a90196 initial commit from stable 0.3
Renaming editors/aspell-br/DETAILS => spelling/aspell-br/DETAILS
Auto-merging spelling/aspell-br/DETAILS
CONFLICT (rename/delete): Rename devel/nhc98/USEGCC2 => gnu/fortran/SOLO in HEAD and deleted in 72fee73c6b6665dff34b0bdfc6552e1a83711d42
Renaming editors/aspell-br/HISTORY => spelling/aspell-br/HISTORY
Auto-merging spelling/aspell-br/HISTORY
CONFLICT (rename/modify): Merge conflict in spelling/aspell-br/HISTORY


This last is still going on and will go on for quite a while. The above output has taken about 5 minutes to print and when it is done and I do a git-pull origin, I get what seem to be the same errors. Will see if it does it this time or not.

John




Archive powered by MHonArc 2.6.24.

Top of Page