[git-users] Re: git-svn hashcode difference before and after dcommit
Yep. you're right. I think i need to take serious look again the workflow you are advocating. On Oct 14, 4:42 pm, Thomas Ferris Nicolaisen wrote: > That sounds like a problematic setup. A git svn dcommit rewrites the commit > by adding git-svn-id's to the commit message, and therefore gets a new hash > (SHA). > > Having a dedicated person that commits changes into SVN will lead to the > others having to reset and rebase, all the time, yes. I think it's better > that each person is responsible for committing his or her own changes back > into SVN. > > I've written a whole lot of stuff about this kind of setup > here:http://www.tfnico.com/presentations/git-and-subversion- Exactly why > having a dedicated repository (or person) committing back to SVN is a bad > idea is explained > here:http://blog.tfnico.com/2011/03/dream-of-bi-directional-git-svn-mirror... -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: git-svn hashcode difference before and after dcommit
That sounds like a problematic setup. A git svn dcommit rewrites the commit by adding git-svn-id's to the commit message, and therefore gets a new hash (SHA). Having a dedicated person that commits changes into SVN will lead to the others having to reset and rebase, all the time, yes. I think it's better that each person is responsible for committing his or her own changes back into SVN. I've written a whole lot of stuff about this kind of setup here: http://www.tfnico.com/presentations/git-and-subversion - Exactly why having a dedicated repository (or person) committing back to SVN is a bad idea is explained here: http://blog.tfnico.com/2011/03/dream-of-bi-directional-git-svn-mirror.html -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/uWSkowuxw5sJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: git-svn hashcode difference before and after dcommit
Yes. my workflow of git-svn usage is (say i have a local git commit with hash "abcd1234" need to check into SVN) 1. git svn rebase (before dcommit) <- at this time hashcode is "abcd1234" 2. git svn dcommit (if no conflict in Step 1) 3. git svn rebase (after dcommit) <- the same commit's hashcode is now "xyz0987" which was "abcd1234") It will be a problem if i have a dedicated person/repo to sync the team changes (which were git commit) into SVN and others in the team using git only. They will need to reset and rebase every time something is synced/ checked in to the SVN. On Oct 14, 11:23 am, David Aguilar wrote: > On Oct 13, 2011, at 8:12 PM, abgalphabet wrote: > > > I found that the hashcode of the same commit is different before and > > after i run "git svn dcommit". > > Is it a expected behavior or is it a bug? > > expected behavior. > > do you use git svn rebase? > > here's a good writeup:http://learn.github.com/p/git-svn.html > > > If it's not a bug, I would have a headache about this as i have a > > small team using git-svn. Everytime i pull all the changes from my > > colleagues (they clone from my git repo) and then dcommit (sync to > > SVN). All the hashcode are changed and i need all my colleague in the > > team to rebase again. that means they need do something like reset > > some commits (which are local commit to their git repo only) and pull > > again from my repo after svn sync. > > > I hope i can describe the scenario clearly and anybody has an idea > > about that wheather on the git-svn config or the git-svn workflow. -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
