working with git-svn (was ...)
Derek Atkins
derek at ihtfp.com
Mon Jul 1 16:59:31 EDT 2013
John,
On Mon, July 1, 2013 3:03 pm, John Ralls wrote:
>
> On Jul 1, 2013, at 10:18 AM, Derek Atkins <derek at ihtfp.com> wrote:
>
>
>>> Why don't you just set up the intermediate repo?
>>
>> What's the point? It just adds more work for me. It means I have to
>> run
>> the git-svn update, git pull, and then git-update scripts every time I
>> want to update a WC repo.
>
> Consider what you have to do if you don't have an intermediate:
> cd master-repo
> git checkout branch-to-work-on
> git svn rebase //So that you're working on the latest rev
> git checkout some-other-branch // This is so you can push back from the
> WC; Git won't let you
> // push to a
> checked out
> branch
> cd WC
> git pull --rebase
> // do work
> git commit
> git push
> cd master-repo
> git checkout branch-to-work-on
> git svn dcommit
Why can't I:
( cd master-repo && git-svn-mirror )
git clone --local -b <branch> master-repo branch-wc
cd branch-wc
...
git-update
(do work)
git commit (do I need to do this? -- I'm guessing I do)
git svn dcommit
> Granted, you can script a lot of that, but it's still more work than
> having an intermediate maintained with
> git-svn-mirror from github.com/Gnucash/helper-scripts on your home network
> and updated via a commit
> hook or a cron job. Then you can git-update; git-svn-dcommit in each WC as
> needed without having to be
> bouncing between the git-svn-master and the WC for every batch of commits.
> Your laptop can have a
> mirror clone of the intermediate just as you're planning for Gnucash in
> order to consolidate fetches.
What does git-svn-mirror do specially, beyond what a git svn fetch would
do in a "pull-only" repo? I'm asking because I do not know exactly how
the existing git-svn repo is pulled/updated at work (yes, there is on).
So *theoretically* I could clone --mirror that one similarly to how I'd
work with the gnucash tree, but I'd only do that if I could dcommit back
without causing issues. And honestly I don't know how to test that
without actually doing a commit.
> Regards,
> John Ralls
-derek
--
Derek Atkins 617-623-3745
derek at ihtfp.com www.ihtfp.com
Computer and Internet Security Consultant
More information about the gnucash-devel
mailing list