On Sun, 2008-01-06 at 20:58 +0100, Bert Timmerman wrote: > Hi Peter, > I create git-patches with qgit and think that this confusion probably > comes from the fact that my local repository where .git lives is 1 level > upstream of gaf.
How is that possible? Do you have some kind of merged git repository? > So I did "git-add gaf/gschem/po/nl_NL.po". > > I didn't use git-branch and git-checkout on this one (unequal number of > directory levels). > > Until now I didn't realize that this could give git-am trouble applying > the patch. > > I will improve on this. No problem now I know what to look for (so long as its not too complex a patch to edit)... I was very confused at first, since git did something stupid trying to apply the patch and guessed you must have been editing the Russian translation for some strange reason, merging the changes into that! -- Peter Clifton Electrical Engineering Division, Engineering Department, University of Cambridge, 9, JJ Thomson Avenue, Cambridge CB3 0FA Tel: +44 (0)7729 980173 - (No signal in the lab!) _______________________________________________ geda-dev mailing list [email protected] http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev
