Hi, > I use stg to submit patch to a project whom I don't have access to svn tree. > I download every source release (every year) of the project. > > I used stg to create patch not yet emailed to their project (I followed the > stg tutorial, > and created a git/stg repository from their official first source release). > Now, they published a new source release. > > Do I have to recreate a new git/stg repository from their new release or is > there a way > to use git/stg to add their new release and try to port my patch to their new > release all > in my existing git/stg repository?
There can be a few ways for doing this. You can keep a separate branch that simply tracks upstream releases and you update it very time there is a new release. On the StGit branch, you just rebase it to the upstream one: stg rebase <upstream> This would pop the patches from the stack, update the base of the stack to the latest upstream and than push the patches onto the new base. If there are conflicts, you would need to solve them, either manually or using git mergetool. If solved manually, you need to do a 'git add' or 'stg resolved' to mark it as resolved, followed by 'stg refresh'. -- Catalin _______________________________________________ stgit-users mailing list [email protected] https://mail.gna.org/listinfo/stgit-users
