Quantcast

Git Mirror

classic Classic list List threaded Threaded
14 messages Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Git Mirror

John Ralls-2
I've set up a git mirror of Gramps's svn repository at https://github.com/jralls/Gramps It updates every 4 hours.

For those dissatisfied with the new SF code browser, I find Github's to be a bit less annoying. It doesn't do side-by-side diffs (which doesn't bother me, I like unified diffs anyway), but cloning it takes only a few minutes compared to the hours it takes to clone the svn repo with svk. Once cloned, one can use whatever local tools one likes. I've been using http://www.syntevo.com/smartgit/index.html for the last few days on Win32 for a largish Glib change and it works reasonably well -- and has side-by-side diffs.

If you want to develop in git and commit back to the svn repo, I've set this up the same way that I did Gnucash, so I think you can follow the instructions at http://wiki.gnucash.org/wiki/Git (with different URIs, of course). My only concern is with Gramps's unconventional branch layout. I think I've set that up correctly, but git-svn might get confused, so be careful the first time you commit back to a branch.

Regards,
John Ralls


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

Nick Hall-6
John,

Thanks for providing this.

I investigated git-svn a few years ago, but didn't get very far. I'll
try it again now.

It may be worth considering switching Gramps from subversion to git
again.  Whilst subversion is fine for small changes, it is not so nice
for more major changes.  Three years ago I suggested looking at git and
also mercurial which has a syntax closer to that of subversion.

Nick.


On 09/12/12 16:37, John Ralls wrote:

> I've set up a git mirror of Gramps's svn repository at https://github.com/jralls/Gramps It updates every 4 hours.
>
> For those dissatisfied with the new SF code browser, I find Github's to be a bit less annoying. It doesn't do side-by-side diffs (which doesn't bother me, I like unified diffs anyway), but cloning it takes only a few minutes compared to the hours it takes to clone the svn repo with svk. Once cloned, one can use whatever local tools one likes. I've been using http://www.syntevo.com/smartgit/index.html for the last few days on Win32 for a largish Glib change and it works reasonably well -- and has side-by-side diffs.
>
> If you want to develop in git and commit back to the svn repo, I've set this up the same way that I did Gnucash, so I think you can follow the instructions at http://wiki.gnucash.org/wiki/Git (with different URIs, of course). My only concern is with Gramps's unconventional branch layout. I think I've set that up correctly, but git-svn might get confused, so be careful the first time you commit back to a branch.
>
> Regards,
> John Ralls
>
>
> ------------------------------------------------------------------------------
> LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
> Remotely access PCs and mobile devices and provide instant support
> Improve your efficiency, and focus on delivering more value-add services
> Discover what IT Professionals Know. Rescue delivers
> http://p.sf.net/sfu/logmein_12329d2d
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel
>
>


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

Benny Malengier


2012/12/11 Nick Hall <[hidden email]>

It may be worth considering switching Gramps from subversion to git
again.  Whilst subversion is fine for small changes, it is not so nice
for more major changes.  Three years ago I suggested looking at git and
also mercurial which has a syntax closer to that of subversion.

Indeed. Switching to git would be nice, and no problem for us. Problem is the translators and not so technical developers. It is to not alienate them we did not convert.

Benny

------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

error in nb.po

enno
Hi,

When I compiled the latest revision of gramps34, make reported a fatal
error in po/nb.po. Can anyone correct this please?

I have no write access to the repository, so I can't do this myself.

Here's my diff:

Index: po/nb.po
===================================================================
--- po/nb.po    (revision 20779)
+++ po/nb.po    (working copy)
@@ -2233,7 +2233,9 @@
  "Details: Could not make database directory:\n"
  "    %s\n"
  "\n"
-msgstr "FEIL: Feil databasesti i Redigermenyen->Innstillinger.\n"
+msgstr ""
+"\n"
+"FEIL: Feil databasesti i Redigermenyen->Innstillinger.\n"
  "Åpne innstillingene og angi riktig databasesti.\n"
  "\n"
  "Detaljer: Kunne ikke lage databasekatalog:\n"

thanks,

Enno


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: error in nb.po

Espen Berg-2
Hi Enno,
sorry for that typo in nb.po. The file is corrected and committed to
subversion. Do an svn up and check now.

Thanks for the note.


Cheers
Espen

2012/12/11 Enno Borgsteede <[hidden email]>:

> Hi,
>
> When I compiled the latest revision of gramps34, make reported a fatal
> error in po/nb.po. Can anyone correct this please?
>
> I have no write access to the repository, so I can't do this myself.
>
> Here's my diff:
>
> Index: po/nb.po
> ===================================================================
> --- po/nb.po    (revision 20779)
> +++ po/nb.po    (working copy)
> @@ -2233,7 +2233,9 @@
>   "Details: Could not make database directory:\n"
>   "    %s\n"
>   "\n"
> -msgstr "FEIL: Feil databasesti i Redigermenyen->Innstillinger.\n"
> +msgstr ""
> +"\n"
> +"FEIL: Feil databasesti i Redigermenyen->Innstillinger.\n"
>   "Åpne innstillingene og angi riktig databasesti.\n"
>   "\n"
>   "Detaljer: Kunne ikke lage databasekatalog:\n"
>
> thanks,
>
> Enno
>
>
> ------------------------------------------------------------------------------
> LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
> Remotely access PCs and mobile devices and provide instant support
> Improve your efficiency, and focus on delivering more value-add services
> Discover what IT Professionals Know. Rescue delivers
> http://p.sf.net/sfu/logmein_12329d2d
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel

------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: error in nb.po

enno
Hi Espen,

Make runs OK now. Thanks for the update.

cheers,

Enno


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

Nick Hall-6
In reply to this post by John Ralls-2
John,

I have started to use your mirror and have a few questions.

1. The command "git tag" lists some tags as hash values.  What tags are
they?  Is it possible to see the descriptions?

2. I can see the following remote branches:

     geps/gep-006-locations
     geps/gep-0065_Using_Setup
     geps/gep-013-server
     geps/gep-021-name
     geps/gep-023-large-sources
     geps/gep-025-name
     geps/gep-026-replace-make
     geps/gep-029-gtk3
     geps/gep-42-Using-Python-DistUtils
     geps/gep27-DistUtils
     gramps-project
     gramps35
     maintenance/gramps10
     maintenance/gramps10@8577
     maintenance/gramps20
     maintenance/gramps22
     maintenance/gramps22@8576
     maintenance/gramps23
     maintenance/gramps23-multinotes
     maintenance/gramps23@8028
     maintenance/gramps30
     maintenance/gramps31
     maintenance/gramps32
     maintenance/gramps33
     maintenance/gramps34
     trunk

These include some old geps that have been deleted from the subversion
repository.  There are also some maintenance branches that I can't see
when browsing the subversion tree.  Do we need all of these branches?

3. I get a lot of untracked pyc and build files listed by "git status".  
I assume we need to create a .gitignore file.  Do you have any advice on
the best way to do this?

4. If I create a gramps34 branch to track maintenance/gramps34, I these
untracked files get left behind when I switch branches. Should we create
a "clean" script in trunk?  In gramps34, "make clean" doesn't remove the
Makefiles so I still have a src directory when I switch back to trunk.

The performance of the mirror is good - I cloned the repository in under
5 minutes.

Nick.


On 09/12/12 16:37, John Ralls wrote:

> I've set up a git mirror of Gramps's svn repository at https://github.com/jralls/Gramps It updates every 4 hours.
>
> For those dissatisfied with the new SF code browser, I find Github's to be a bit less annoying. It doesn't do side-by-side diffs (which doesn't bother me, I like unified diffs anyway), but cloning it takes only a few minutes compared to the hours it takes to clone the svn repo with svk. Once cloned, one can use whatever local tools one likes. I've been using http://www.syntevo.com/smartgit/index.html for the last few days on Win32 for a largish Glib change and it works reasonably well -- and has side-by-side diffs.
>
> If you want to develop in git and commit back to the svn repo, I've set this up the same way that I did Gnucash, so I think you can follow the instructions at http://wiki.gnucash.org/wiki/Git (with different URIs, of course). My only concern is with Gramps's unconventional branch layout. I think I've set that up correctly, but git-svn might get confused, so be careful the first time you commit back to a branch.
>
> Regards,
> John Ralls
>
>
> ------------------------------------------------------------------------------
> LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
> Remotely access PCs and mobile devices and provide instant support
> Improve your efficiency, and focus on delivering more value-add services
> Discover what IT Professionals Know. Rescue delivers
> http://p.sf.net/sfu/logmein_12329d2d
> _______________________________________________
> Gramps-devel mailing list
> [hidden email]
> https://lists.sourceforge.net/lists/listinfo/gramps-devel
>
>


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

Benny Malengier


2012/12/12 Nick Hall <[hidden email]>
4. If I create a gramps34 branch to track maintenance/gramps34, I these
untracked files get left behind when I switch branches. Should we create
a "clean" script in trunk?  In gramps34, "make clean" doesn't remove the
Makefiles so I still have a src directory when I switch back to trunk.

First, if you only want to remove untracked files, use git clean:
http://www.kernel.org/pub/software/scm/git/docs/git-clean.html

If you have local changes and need to switch branch:
See: http://stackoverflow.com/questions/2187000/untracked-files-between-branches-in-git

So commit, and use soft reset, or hard reset
If you don't want to undo commit in the branch or merge commit, use git stash on modified files and clean the branch, then switch branch

Benny

------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

Nick Hall-6
On 12/12/12 20:07, Benny Malengier wrote:


2012/12/12 Nick Hall <[hidden email]>
4. If I create a gramps34 branch to track maintenance/gramps34, I these
untracked files get left behind when I switch branches. Should we create
a "clean" script in trunk?  In gramps34, "make clean" doesn't remove the
Makefiles so I still have a src directory when I switch back to trunk.

First, if you only want to remove untracked files, use git clean:
http://www.kernel.org/pub/software/scm/git/docs/git-clean.html

If you have local changes and need to switch branch:
See: http://stackoverflow.com/questions/2187000/untracked-files-between-branches-in-git

So commit, and use soft reset, or hard reset
If you don't want to undo commit in the branch or merge commit, use git stash on modified files and clean the branch, then switch branch

Benny

Thanks, git clean was what I was looking for.  I've also read the documentation for stash and reset.

I have created a single .gitignore file in the top level directory.  There are some example files that are useful:

https://github.com/github/gitignore

Next I'll see if I can commit to the subversion repository.

Nick.



------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

Nick Hall-6
In reply to this post by John Ralls-2
John, Benny,

I have created a wiki page to describing my trial of using git for
Gramps development:

http://www.gramps-project.org/wiki/index.php?title=Git

Maybe others will find this useful.

I have some more questions though:

I created a single .gitignore file in the top level directory and
committed it.

1.  I was asked twice for my password.  Is there any way to store this
as subversion does?
2.  A branch called "master" was created.  Why is this?
3.  No svn properties were set on the new file.  Can I set them using
git-svn?
4.  There is a "git svn create-ignore" command which creates .gitignore
files from subversion properties.  Should we use this?
5. Is it safe to use "git svn rebase" to get commits that are more
recent than those in the mirror?  I notice that the username and email
address do not get translated.

So far I like using git!   Using it in conjunction with subversion does
add extra complexity though.

Nick.


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

John Ralls-2

On Dec 13, 2012, at 2:17 PM, Nick Hall <[hidden email]> wrote:

> John, Benny,
>
> I have created a wiki page to describing my trial of using git for
> Gramps development:
>
> http://www.gramps-project.org/wiki/index.php?title=Git
>
> Maybe others will find this useful.
>
> I have some more questions though:
>
> I created a single .gitignore file in the top level directory and
> committed it.
>
> 1.  I was asked twice for my password.  Is there any way to store this
> as subversion does?
Not that I know of. You should in any case not be relying on stored passwords. Instead, set up an SSH key to use with sourceforge and change the URI in .git/configure to SVN+SSH://svn.code.sf.net/...

> 2.  A branch called "master" was created.  Why is this?
Since I don't see it in SF, I guess that it was created in your git repo. That's just git's default behavior. You can either make it track origin/trunk or make a new branch "trunk" to track origin/trunk and delete "master". Totally a preference matter.
> 3.  No svn properties were set on the new file.  Can I set them using
> git-svn?
Seems not. Git-svn's documentation discusses reading svn properties, but nothing about writing them.
> 4.  There is a "git svn create-ignore" command which creates .gitignore
> files from subversion properties.  Should we use this?
You can if you want.
> 5. Is it safe to use "git svn rebase" to get commits that are more
> recent than those in the mirror?  I notice that the username and email
> address do not get translated.
Not really. The script which maintains the mirror does some extra magic with branches and tags, as well as having an author file (which I can share if you like -- I didn't want to put it in the repo since we already have two) which will cause hashes to be different, so git won't recognize them and you'll get a messy history. It will also put git svn's pointers out of whack with respect to git-update's. You can fix it all with by git reset --hard and git svn reset to put the state back to where you last were in sync with the mirror then running git-update, but that's probably not something that you want to do routinely.
>
> So far I like using git!   Using it in conjunction with subversion does
> add extra complexity though.

I have yet to meet someone who's gotten used to git and then been happy about going back to subversion. ;-)

Have you tried out one of git's graphical interfaces yet?

Regards,
John Ralls


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

John Ralls-2
In reply to this post by Nick Hall-6

On Dec 12, 2012, at 10:25 AM, Nick Hall <[hidden email]> wrote:

> John,
>
> I have started to use your mirror and have a few questions.
>
> 1. The command "git tag" lists some tags as hash values.  What tags are
> they?  Is it possible to see the descriptions?

Hmmph. Something got messed up with the tag routine in git-svn-mirror, the perl script that makes a subversion repo look git-ish. They all point to r20773, that's obviously not right. I'll have to clean them out and try to figure out why none of the real tags are getting carried over to git.

>
> 2. I can see the following remote branches:
>
>     geps/gep-006-locations
>     geps/gep-0065_Using_Setup
>     geps/gep-013-server
>     geps/gep-021-name
>     geps/gep-023-large-sources
>     geps/gep-025-name
>     geps/gep-026-replace-make
>     geps/gep-029-gtk3
>     geps/gep-42-Using-Python-DistUtils
>     geps/gep27-DistUtils
>     gramps-project
>     gramps35
>     maintenance/gramps10
>     maintenance/gramps10@8577
>     maintenance/gramps20
>     maintenance/gramps22
>     maintenance/gramps22@8576
>     maintenance/gramps23
>     maintenance/gramps23-multinotes
>     maintenance/gramps23@8028
>     maintenance/gramps30
>     maintenance/gramps31
>     maintenance/gramps32
>     maintenance/gramps33
>     maintenance/gramps34
>     trunk
>
> These include some old geps that have been deleted from the subversion
> repository.  There are also some maintenance branches that I can't see
> when browsing the subversion tree.  Do we need all of these branches?

They're not really deleted from subversion, apparently, maybe just hidden.
>
> 3. I get a lot of untracked pyc and build files listed by "git status".  
> I assume we need to create a .gitignore file.  Do you have any advice on
> the best way to do this?
Type it in? Use git-svn --create-ignore?

The problem with .gitignore is that it tends to be personal, so I generally don't include them in repositories. OTOH, it does no harm to have a generic one (which ignores *.pyc and *.pyo, perhaps) since one can have a personalized .gitignore in one's $HOME.

>
> 4. If I create a gramps34 branch to track maintenance/gramps34, I these
> untracked files get left behind when I switch branches. Should we create
> a "clean" script in trunk?  In gramps34, "make clean" doesn't remove the
> Makefiles so I still have a src directory when I switch back to trunk.
>

I think Benny answered this.
> The performance of the mirror is good - I cloned the repository in under
> 5 minutes.

Regards,
John Ralls


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

Nick Hall-6
In reply to this post by John Ralls-2
John,

Thanks for these answers.

I found that git does support password caching with:

git config --global credential.helper cache

but I set up an SSH key instead, as you suggested.

The branch called master was created when I did the "git svn rebase".  
It was easy to remove and I won't try to update from the subversion
repository again.

I notice that you mention running the git-update script.  I followed the
instructions in the following link which removes the need for this.

http://blog.tfnico.com/2011/09/git-svn-mirror-without-annoying-update.html

It seems to work.  Can you see any disadvantages with this approach?

I have started to look at gitk and git-gui, but I wanted to get familiar
with the command line first.

So far, from what I've seen, I can't see myself going back to subversion
either.  :)

Nick.


On 13/12/12 22:56, John Ralls wrote:

> On Dec 13, 2012, at 2:17 PM, Nick Hall <[hidden email]> wrote:
>
>> John, Benny,
>>
>> I have created a wiki page to describing my trial of using git for
>> Gramps development:
>>
>> http://www.gramps-project.org/wiki/index.php?title=Git
>>
>> Maybe others will find this useful.
>>
>> I have some more questions though:
>>
>> I created a single .gitignore file in the top level directory and
>> committed it.
>>
>> 1.  I was asked twice for my password.  Is there any way to store this
>> as subversion does?
> Not that I know of. You should in any case not be relying on stored passwords. Instead, set up an SSH key to use with sourceforge and change the URI in .git/configure to SVN+SSH://svn.code.sf.net/...
>
>> 2.  A branch called "master" was created.  Why is this?
> Since I don't see it in SF, I guess that it was created in your git repo. That's just git's default behavior. You can either make it track origin/trunk or make a new branch "trunk" to track origin/trunk and delete "master". Totally a preference matter.
>> 3.  No svn properties were set on the new file.  Can I set them using
>> git-svn?
> Seems not. Git-svn's documentation discusses reading svn properties, but nothing about writing them.
>> 4.  There is a "git svn create-ignore" command which creates .gitignore
>> files from subversion properties.  Should we use this?
> You can if you want.
>> 5. Is it safe to use "git svn rebase" to get commits that are more
>> recent than those in the mirror?  I notice that the username and email
>> address do not get translated.
> Not really. The script which maintains the mirror does some extra magic with branches and tags, as well as having an author file (which I can share if you like -- I didn't want to put it in the repo since we already have two) which will cause hashes to be different, so git won't recognize them and you'll get a messy history. It will also put git svn's pointers out of whack with respect to git-update's. You can fix it all with by git reset --hard and git svn reset to put the state back to where you last were in sync with the mirror then running git-update, but that's probably not something that you want to do routinely.
>> So far I like using git!   Using it in conjunction with subversion does
>> add extra complexity though.
> I have yet to meet someone who's gotten used to git and then been happy about going back to subversion. ;-)
>
> Have you tried out one of git's graphical interfaces yet?
>
> Regards,
> John Ralls
>
>
>


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

Re: Git Mirror

John Ralls-2

On Dec 15, 2012, at 4:36 AM, Nick Hall <[hidden email]> wrote:
> I notice that you mention running the git-update script.  I followed the instructions in the following link which removes the need for this.
>
> http://blog.tfnico.com/2011/09/git-svn-mirror-without-annoying-update.html
>
> It seems to work.  Can you see any disadvantages with this approach?
>

Ooh, neat trick. I'll have to try that out.

No, I don't see any issues with it if it works as advertised.

Regards,
John Ralls


------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Gramps-devel mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/gramps-devel
Loading...