[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnucap-devel] Problem with logic elements, patch howto

From: Felix Salfelder
Subject: Re: [Gnucap-devel] Problem with logic elements, patch howto
Date: Mon, 12 Nov 2012 11:27:12 +0100
User-agent: Mutt/1.5.20 (2009-06-14)

On Sun, Nov 11, 2012 at 02:50:16PM +0000, Rupert Swarbrick wrote:
> How do you propose I do that with a three-year-old snapshot?

one way to patch 0.36 would be
- locate commit in git repo {gitk, git --log} --all
- export patch: git show -p edbfa31886 > /tmp/patch
- unpack tarball; cd into
- patch: patch -p1 < /tmp/patch
- (resolve conflicts (sorry))

or use git-cherry-pick:
- clone repo from tool; cd into
- locate commit
- git checkout al
- git chechout -b logic_tinkering
- git cherry-pick edbfa31886
- resolve conflicts (easier now), git add files
- git commit

or git-rebase 
- clone repo from tool; cd into
- git checkout logic
- git checkout -b logic_tinkering
- git rebase -i al
- delete everything but the one line, :wq
- resolve conflicts; git add
- git rebase --continue (iterates if more than one patch is involved)

needless to say, the git variant simplifies keeping track of patches,
use e.g. gitk to browse them.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]