[git-users] Re: svn remove branch not passed through to git
Yes, this is true. By default, you'll get a lot of stale branches in your fetching repo. For the time being, I've ignored this. I regularly clean it up. Say I have a mirror of a svn repo with trunk, tags/1.0 and a branch branches/1.0.x: Fetching repo: tfnico:~/git-repos/website-fetching/git branch -a * master remotes/1.0-x remotes/tags/1.0 remotes/trunk Bare repo: tfnico:~/git-repos/website.git/git branch 1.0-x tags/1.0 trunk Notice the 1.0-x branch. Now I remove the branch in SVN: svn rm file:///Users/tfnico/svn-repos/main/website/branches/1.0-x I run sync in the fetching repo: tfnico:~/git-repos/website-fetching/git svn fetch;git push origin Everything up-to-date So, nothing changed there. The deletion of the branch was not propagated, and the 1.0-x branch still present. I now start cleaning up by removing it in the fetching repo: tfnico:~/git-repos/website-fetching/rm .git/refs/remotes/1.0-x tfnico:~/git-repos/website-fetching/git branch -a * master remotes/tags/1.0 remotes/trunk Now sync again: tfnico:~/git-repos/website-fetching/git svn fetch;git push origin Everything up-to-date So, the branch is not recreated. Now clean up in the bare repo: tfnico:~/git-repos/website.git/rm refs/heads/1.0-x tfnico:~/git-repos/website.git/git branch rm tags/1.0 trunk Now, branch is gone is forever, unless we later on do a full git svn clone (which recreates all previous branches, also the removed ones). It's a bit messy, but think of it as manual maintenance you just have to do once in a while. -- 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: svn remove branch not passed through to git
On Tue, Mar 29, 2011 at 9:51 AM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: Yes, this is true. By default, you'll get a lot of stale branches in your fetching repo. For the time being, I've ignored this. I regularly clean it up. Say I have a mirror of a svn repo with trunk, tags/1.0 and a branch branches/1.0.x: Fetching repo: tfnico:~/git-repos/website-fetching/git branch -a * master remotes/1.0-x remotes/tags/1.0 remotes/trunk Bare repo: tfnico:~/git-repos/website.git/git branch 1.0-x tags/1.0 trunk Notice the 1.0-x branch. Now I remove the branch in SVN: svn rm file:///Users/tfnico/svn-repos/main/website/branches/1.0-x I run sync in the fetching repo: tfnico:~/git-repos/website-fetching/git svn fetch;git push origin Everything up-to-date So, nothing changed there. The deletion of the branch was not propagated, and the 1.0-x branch still present. I now start cleaning up by removing it in the fetching repo: tfnico:~/git-repos/website-fetching/rm .git/refs/remotes/1.0-x tfnico:~/git-repos/website-fetching/git branch -a * master remotes/tags/1.0 remotes/trunk Now sync again: tfnico:~/git-repos/website-fetching/git svn fetch;git push origin Everything up-to-date So, the branch is not recreated. Now clean up in the bare repo: tfnico:~/git-repos/website.git/rm refs/heads/1.0-x tfnico:~/git-repos/website.git/git branch rm tags/1.0 trunk Now, branch is gone is forever, unless we later on do a full git svn clone (which recreates all previous branches, also the removed ones). It's a bit messy, but think of it as manual maintenance you just have to do once in a while. Thanks. I will have to do it this way. -- Sabba - סבא הלל - Hillel Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore sabbahil...@gmail.com | The fish are the Jews, Torah is our water http://sabbahillel.blogspot.com -- 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] git gui equivalent to git checkout -b
What is the git gui equivalent to git checkout -b? I have a working tree with changes that I don't want to commit to master yet. So I want to create a new branch to contain my changes. If I go to Branch-Checkout, I don't see an option to create a new branch. If I go to Branch-Create, I see an option to Checkout After Creation, but I want to be sure that is the right choice. -- 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] dcommit with conflict
In running a git upci on a particular file, it has been updated in the svn repository but not yet picked up by the git svn fetch repository or put into the git repository. Running git upci (update-ref and dcommit) I get an error message from dcommit. Commiting to svn repo/README.txt Merge conflict during commit: File or directory 'README.txt is out of date; try updating: The version resource does not correspond to the resource within the transaction ... I had updated the file with a git pull and the automerge was successful. I have identified the lines that were changed within svn and also the lines committed from within git. What do I do now? Should I issue a git push from my local git to the git repository followed bu a git svn dcommit and then a git svn rebase and git push from the fetch repository? -- Sabba - סבא הלל- Hillel Hillel (Sabba) Markowitz | Said the fox to the fish, Join me ashore sabbahil...@gmail.com | The fish are the Jews, Torah is our water http://sabbahillel.blogspot.com -- 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] Security experts from Cyberoam, Novell, Wipro, IBM all at one place @Security Conf (April 9th, Mumbai)
Hello , How are you doing? The Conference will address the challenges and issues at the forefront of enterprise security. The conference brings together practitioners, professionals, and others interested in the latest advances in the security of computer systems and networks. Today ’s changing security landscape means you can’t leave anything to chance.. And new threats have kept you on your toes. We have 9 exciting technical sessions, delivered by Security experts. Learn what are some more of the unsettling things that need to be addressed? Sessions on: A New Security Blueprint Insider Threat: Identifying Your Insider Real Security for Server Virtualization Securing the Virtual Infrastructure The Truth is on the Wire: Event Analysis and Routine Monitoring Using Network Traffic The Changing Face of Endpoint Security Attacking and Defending SSL VPNs Network Access Technology: How to Manage Your IT Infrastructure Responding to a Wireless Attack on Your Network Intelligent Workload Management: Addressing Security Identity Concerns You'll get the answers to these and many more questions at the conference: -What must I know about the evolving technologies of information security and related disciplines? -How do I become a more effective security professional? -How do I technically secure applications, or handle security for my industry specific requirements? -What is my career path within or outside my current company/agency? -How can I communicate my value to the business more effectively? Speakers: Vaidyanathan Iyer, Sales Leader, IBM Security Solutions Abhilash Sonwane, Sr. Vice President, Cyberoam Vijay Mahajani, Sr. Manager, Wipro Consulting Services Tejas Lagad, Director of Product Management, BFSI, Nexus Technology K. K. Mookhey, Principal Consultant, Network Intelligence India Shreeraj Shah, Director, Blueinfy SecurityExposure Kartik Shinde, Senior Manager - Advisory Services, Ernst Young Jaimon Jose Distinguished Engineer, Novell Inc DATE: April 9th, 2011 (Saturday) TIME: 9.00 AM to 5 PM VENUE: Ms Subbu Lakshmi Auditorium,Plot - H, Bhaudaji Road Extention,Behind King Geogre Railway Station,South Indian Education Society,Sion West, Mumbai - 2 REGISTER NOW: We have limited Seats. Attendance is limited to maintain an intimate setting and foster dialogue among all participants. To register, please visit: http://bit.ly/securitymum and complete the form . There is a registration fee of Rs 500 only. This is towards: Access to Sessions, Tea/ Coffee Refreshments and Lunch. We will also encourage you to pass on this note to your colleagues so that they could benefit from this conference. Please note: You may also ask your organization/ manager to sponsor you and your colleagues to attend this exciting conference. Security Conference 2011 provides an excellent opportunity to meet and network with delegates in a professional learning environment whilst demonstrating your commitment to community and the industry. Thanks Kavya Shree _ Kavya Shree Event Executive siliconindia Ph: 91.80. 43112134 Mob: 91.8951319868 SiliconIndia is 12-year old media firm. We publish two technology business magazines—one in the U.S and the other in India. Over the last one decade, SiliconIndia.com has emerged as the most trusted source for news and information for professionals. The portal has a global ranking of No.4 in the IT News Media category. With over 3 million registered users, SiliconIndia.com is the fastest growing portal and is ranked among the top 100 websites most trafficked from India. -- 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.
