This is the mail archive of the newlib@sourceware.org mailing list for the newlib project.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
On Mar 26 11:53, Thomas Wolff wrote: > Am 26.03.2018 um 10:01 schrieb Corinna Vinschen: > > On Mar 25 11:02, Thomas Wolff wrote: > > > as attached > > > Thomas > > Thanks, but the patch is broken. The last line in the patch is the > > start of another patch hunk, which then is missing. Can you fix that, please? > Yeah, I tried to limit git fiddling effort by manually manipulating the > patch, which failed. Never a good idea. > (After I tried to re-sync with the current repository, it would insist on > some merging, and I do not know how to rectify that; Never do your patches on the master branch. Create a new branch from current master and work there: git checkout -b fix-towctrans-doc [hack, hack, hack] git commit git format-patch After the changes have been commited, just remove your hack branch, e.g.: git checkout master git fetch && git merge (or `git pull) git branch -D fix-towctrans-doc Since branches are local, they are really cheap, very different from CVS, for instance. > manual fixing of the file, git pull -f... nothing helped (error: Pulling is > not possible because you have unmerged files); Before you try to merge: If you accidentally hacked on master, *now* create your hack branch git branch fix-towctrans-doc master then reset master to upstream master (in the state known to your local git repo) and merge the latest from upstream master: git reset --hard origin/master git fetch && git merge (or `git pull') Note that you can do the above even after you already accidentally merged too early. Your patch will still be available on the fix-towctrans-doc branch. Just have a look into the branch and find your patch: git checkout fix-towctrans-doc git log --oneline [prints all patches including yours with a shortened SHA-1 ID, e.g.] [...] 123abc456def comments to document struct caseconv_entry [...] then cherry-pick your patch on top of master and, if required, fix conflicts: git co master git cherry-pick 123abc456def > I know I should eventually > consult the howto you kindly pointed me to...) Definitely. Because... > So, based on a fresh git clone, ... ... you're making your life much harder than necessary. git has a steep learning curve, I bet everyone on this list will agree on that, but it's worth the effort (and you will learn something new even after you think you got a grip on git). > ... here's an updated patch, also fixing one > remaining minor layout glitch. > Thomas Pushed. Thanks, Corinna -- Corinna Vinschen Cygwin Maintainer Red Hat
Attachment:
signature.asc
Description: PGP signature
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |