Tag Archive for 'branching'

WANdisco’s February Roundup

This month, we launched a trio of innovative Hadoop products: the world’s first production-ready distro; a wizard-driven management dashboard; and the first and only 100% uptime solution for Apache Hadoop.

hadoop big data

We started this string of Big Data announcements with WANdisco Distro (WDD) a fully tested, free-to-download version of Apache Hadoop 2. WDD is based on the most recent Hadoop release, includes all the latest fixes and undergoes the same rigorous quality assurance process as our enterprise software solutions.

This release paved the way for our enterprise Hadoop solutions, and we announced the WANdisco Hadoop Console (WHC) shortly after. WHC is a plug-and-play solution that makes it easy for enterprises to deploy, monitor and manage their Hadoop implementations, without the need for expert HBase or HDFS knowledge.

The final product in this month’s Big Data announcements was WANdisco Non-Stop NameNode. Our patented technology makes WANdisco Non-Stop Namenode the first and only 100% uptime solution for Hadoop, and offers a string of benefits for enterprise users:

  • Automatic failover and recovery
  • Automatic continuous hot backup
  • Removes single point of failure
  • Eliminates downtime and data loss
  • Every NameNode server is active and supports simultaneous read and write requests
  • Full support for HBase

To support the needs of the Apache Hadoop community, we’ve also launched a dedicated Hadoop forum. At this forum, users can get advice on their Hadoop installation and connect with fellow users, including WANdisco’s core Apache Hadoop developers Dr. Konstantin V. Shvachko, Dr. Konstantin Boudnik, and Jagane Sundar.

subversion

For Apache Subversion users, we announced the next webinars in our free training series:

  • Subversion Administration – everything you need to administer a Subversion development environment
  • Introduction to SmartSVN – a short introduction to how Subversion works with the SmartSVN graphical client
  • Checkout Command – how to get the most out of the checkout command, and the meaning of the various error messages you may encounter
  • Commit Command – learn more about this command, including diff usage, working with unversioned files and changelists
  • Introduction to Git – everything a new user needs to get started with Git
  • Hook Scripts – how to use hook scripts to automate tasks such as email notifications, backups and access control
  • Advanced Hook Scripts – an advanced look at hook scripts, including using a config file with hook scripts and passing data to hook scripts

We’ve announced an ongoing series of free webinars, which demonstrate how you can overcome these challenges from an administrative, business and IT perspective, and get the most out of deploying Subversion in an enterprise environment. These ‘Scaling Subversion for the Enterprise’ webinars will be conducted by our expert Solution Architect three times a week (Tuesday, Wednesday and Thursday) at 10.00am PST/1.00pm EST, and will cover:

  • The latest technology that can help you overcome the limitations and risks associated with globally distributed deployments
  • Answers to your business-specific questions
  • How to solve critical issues
  • The free resources and offers that can help solve your business challenges

All About SVN Copy

Apache Subversion’s commit command allows you to quickly create a copy of item(s) at both the working copy and the repository level. It’s most commonly used in creating branches.

In this tutorial, learn how to use the ‘svn copy’ command to copy file(s) in the working copy and the repository, alongside options such as copying items at specific revisions.

…in the Working Copy

The ‘svn copy’ command allows you to create a copy and place it in a new location within the working copy by running the command followed by the location of the item(s) you’re copying and the new location.

In this example, we’re creating a copy of the ‘Release3’ folder and placing it inside the ‘Releases’ directory.

svn copy (working-copy-path)/item-being-copied (working-copy-path)/item-being-created

svn copy

Check your working copy and you’ll see the file (‘Release4’) has successfully been created. Remember, this is a local change so you’ll need to perform an ‘svn commit’ to share it with the rest of your team.

svn copy 2

….in the Repository

Alternatively, you can create copies at the repository level. This change will automatically create a new revision so you’ll need to provide a log message alongside the ‘svn copy’ command.

svn copy (repository-URL)/item-being-copied -m “log message” (repository-URL)/item-being-created

svn copy 3

You can also copy item(s) as they existed in particular revisions, by specifying a revision number:

svn copy -r(revision-number) (repository-URL)/item-being-copied -m “log message” (repository-URL)/item-being-created

If no revision number is given, Subversion will default to HEAD.

 

svn copy 4

….Or Both 

Finally, you can copy item(s) between the working copy and the central repository. Note that when you’re copying to/from the repository, the usual rules apply: A log message is required, and the repo will copy the HEAD revision unless instructed otherwise.

In this example, we’re creating a copy of the “Release3” folder in the working copy and adding it to the repository as a folder called “Release5.”

svn copy 4

Want more advice on your Apache Subversion installation? We have a full series of SVN refcards for free download, covering hot topics such as branching and merging, and best practices. You can find out more at www.wandisco.com/svnref

WANdisco Announces Free Subversion Webinars for 2013

After getting a fantastic response to our free Subversion webinars in 2012, we’re pleased to announce the first webinars of 2013.

Getting Started With Subversion

A one-hour course to kickstart newcomers to both Subversion and version control in general, covering everything you need to get up and running with this popular open source version control system.

The webinar will cover:

  • Repository basics
  • Performing commits
  • Performing checkouts
  • Simple merging
  • The working copy
  • Simple branching

Getting Started With Subversion’ will take place on January 24th, 2013 10:00am PST / 1:00pm EST, so be quick to avoid missing out.

Branching Options for Development

Branching can cause confusion for many Subversion users, but once mastered it can be one of Subversion’s greatest strengths. In this one hour webinar our Subversion expert will cover the different types of branches and deep dive into their particular uses. Topics covered will include:

  • What is concurrent development?
  • What is a branch?
  • Different development models
  • What triggers a branch?
  • Communication for branching and merging

‘Branching Options for Development’ will take place on February 14th, 2013. Registration will open soon, so keep checking back for all the latest information or follow us on Twitter.

Getting Info out of Subversion

Need to build a report based on your Subversion project? This free-to-attend online training will share techniques for extracting information out of Subversion, for reporting purposes.

Topics will include:

  • Log information
  • Property information
  • Difference information
  • Using Project and User information
  • Using Hook scripts to log information

Getting Info out of Subversion’ will take place on February 28th, 2013.

Have an idea for a future webinar, or feedback on our current schedule of free Subversion training? Please don’t hesitate to leave us a comment on this blog, or Contact Us directly.

 

How to Create a Branch and Tag in Apache Subversion

In Apache Subversion branches and tags are effectively the same thing – a copy of an existing folder and its contents, in a new location within the same repository. The main difference is the way the user handles branches and tags:

  • Branches – these should be used to work on significant changes, variations of code, and bug fixes.
  • Tags – should be used as “code milestones” that provide a snapshot of your project at a specified point.

In this post, we’ll show you how to create a branch, before providing an example of creating a tag.

Creating a Branch

To create a new branch, use the ‘svn copy’ command followed by a log message (-m) and the URL of both the resource being branched, and the location where you want to create your new branch:

svn copy -m “Creating a new branch” folder-being-branched location-of-new-branch

In this example, we are creating a new branch called ‘bug fix branch’ inside the ‘branches’ folder, that will contain all the files in the trunk:

Creating a Tag

Creating a tag uses exactly the same command, although it is good practice to create a dedicated ‘tags’ folder, where you can store all your tags.

In this example, we are creating a new tag called ‘Release1,’ again by copying the files currently in the trunk.

Tip. Whether you are creating a branch or a tag, it’s worth putting some thought into your naming strategy. A coherent naming strategy allows other team members to get an insight into what development work is happening in which branch/tag, at a glance.

Subversion Live 2012: Branching and Merging

Branching and merging is one of the issues Apache Subversion users seem to encounter the most issues with, and with that in mind we designed the Subversion Live 2012 programme to include plenty of best practices, tips and tricks on branching and merging.

Subversion Live 2012 attendees had the opportunity to attend two breakout sessions on branching and merging during the second day of the conference. The first breakout, ‘Branching and Merging Best Practices’ was conducted by WANdisco’s Director of Subversion Training, Mike Lester.

Mike’s session covered essential know-how for mastering branching and merging in Subversion, including factors that should be taken into account when planning your branching strategy, such as how to handle releases and bug fixes, and what changes require a branch. Mike advised that these decisions should be clearly laid out in a Policies and Procedures document.

He also shared some best practices for tracking branch usage, which included controlling where branches can be created and implementing a clear naming convention for your branches. On the merge tracking side of things, he explained how svn mergeinfo can be used to track merges.

Mike Lester’s session concluded with a Q and A session, where attendees had the opportunity to share their own branching and merging strategies, and get feedback from both Mike Lester and the other attendees.

After lunch, delegates had the opportunity to attend a ‘Merge and Performance Improvements’ session, led by Julian Foad. Julian is the lead developer for enhancements to Subversion’s merge capabilities at WANdisco, and his session delved into greater depth regarding the upcoming reintegrate merge overhaul in Subversion 1.8.

Julian explained that in Subversion 1.8, users will no longer have to specify that they are performing a reintegrate merge. This will make merging quicker, easier and less error-prone than in previous releases.

In Subversion 1.8, a branch will no longer become redundant after a reintegrate merge has been performed, so developers will be able to continue using the branch.

Julian also went into detail about how these merge changes will impact the SVN help command, essentially making the ‘svn help merge’ output more concise.

Read all about Subversion Live 2012, with our recaps of Day One and Day Two, and an in-depth look at the Subversion Live Keynote and the What’s Coming in SVN 1.8: Overview session. You can also check out Subversion Live 2012: Your Feedback to see what people are saying about the conference.

Merging in Subversion: Merge a Range of Revisions

Along with branching, merging is the issue that regularly causes Apache Subversion users the most confusion – but merging needn’t be complicated! In this post, we’ll show you how to successfully perform a merge in less than ten steps, using TortoiseSVN’s ‘merge a range of revisions’ option.

Tip. Two common scenarios where this type of merge comes in handy are sync’ing a development branch by applying all the latest changes from its ‘parent’ branch; and cherry-picking specific changes to add to your release branch.

To merge a range of revisions:

1) Right-click on the file you wish to merge and open the ‘TortoiseSVN’ menu.

2) Select ‘Merge’ from TortoiseSVN’s sub-menu.

 

 

 

 

 

 

 

 

3) Select the ‘Merge a Range of Revisions’ option.

 

 

 

 

 

 

 

 

 

4) In the ‘Merge’ dialog, select the desired URL using the “….” button.

5) Either specify the revision numbers you wish to merge, or leave the revision range blank to merge all outstanding changes from the specified source.

 

 

 

 

 

 

 

 

 

6) Once you have entered all the relevant information, click ‘Next.’

7) TortoiseSVN will open the ‘Merge options’ dialog. In most instances, the default settings can be used.

8) Select ‘Merge’ to perform your merge!

Need more info on branching and merging in Subversion? This year’s Subversion Live series of conferences features a session dedicated to Branching and Merging Best Practices. Visit http://www.wandisco.com/svn-live-2012 to find out more.

Getting Started with Apache Subversion

As the world’s most popular version control system, Apache Subversion has plenty to offer newcomers:

1. It’s an established project – accepted into the Apache Incubator in 2009 and graduating a year later, today Subversion is an Apache Top Level Project maintained by a global community of contributors.

2. Rich ecosystem – Apache Subversion users have access to countless free client tools, GUIs and plugins developed by the community. SVN also integrates with most of the major IDEs, including Eclipse and Microsoft Visual Studio.

3. Free Community Support – Have a question about Subversion? There’s no shortage of mailing lists and forums (including SVNForum.) In many cases, your question will have already been asked (and answered) by someone else. If you can’t find the answer, you can always post it yourself and the community will be happy to help you out.

4. Professional Support – Subversion has a great community of users who are always willing to answer queries, but mailing lists and forums aren’t always the ideal place to reach out to when disaster strikes your enterprise deployment. At WANdisco, we offer professional support services for Subversion, that includes 24-by-7 worldwide coverage, guaranteed response times, and indemnification coverage, for those who need that added security.

5. Powerful branching and merging functionality – Branching and merging can be a pain-point for Apache Subversion users but, used correctly, branching and merging can be Subversion’s greatest strength. We have some free branching and merging refcards, to help you master these potentially tricky issues.

Apache Subversion has plenty to offer users, but if you’re new to SVN – or even version control in general! – it can be difficult to know where to start. To help newcomers get off to a flying start with Subversion, we’ve just released a ‘Getting Started with Subversion’ refcard. This refcard covers all the essential information you need to get going with Subversion, including what Subversion actually is, the basic work cycle you can expect to encounter, and an installation guide. It then demonstrates how to create your first repository and covers the essential commands – svn checkout and svn commit.

Getting Started with Subversion’ is free to download. We’ll be adding more refcards in the coming weeks, so keep checking back for all the latest Free Training Content.

Subversion Live: Branching and Merging Best Practices

You may already have heard that Subversion Live is back for 2012, once again bringing the Apache Subversion community their own conference series. This year’s conference series is bigger and better than ever, with events taking place in San Francisco (October 10th & 11th) Greenwich Connecticut (October 16th & 17th) and London (October 23rd & 24th).

Confirmed sessions include:

  • What’s coming in 1.8
  • Best Practices for Large SVN Deployments
  • Merge & Performance Improvements
  • Apache Bloodhound
  • Hook Scripts
  • ….and more!

As part of Subversion Live 2012, WANdisco’s Director of Training Mike Lester will deliver a session on branching and merging best practices. We caught up with Mike, to find out what Subversion Live attendees can expect from ‘Branching & Merging Best Practices,’ and how 1.7’s merge tracking enhancements impacted Subversion users.

In your opinion, why does branching and merging remain such a hot topic for Subversion developers?

Mike Lester: People fear merging and thus avoid using branches, one of the most powerful tools built into Apache Subversion. They forget that as developers they have been doing branching and merging by hand for years, and fail to take advantage of all the capabilities that Subversion can bring to these activities.

Apache Subversion 1.7 introduced some merge tracking enhancements. How did these impact the branching and merging process for SVN users?

Mike Lester: By isolating the subtree mergeinfo updates to only the subtrees affected by a merge, rather than updating all subtree merge info, it makes keeping track of what was actually changed easier to monitor.

Who would benefit from attending ‘Branching and Merging Best Practices?

Mike Lester: Anyone that uses Subversion on multi-developer projects needs to come up with a plan on how they will use branches and merging. If you don’t have a plan yet or think your current procedures might be improved, this talk should help.

Can you give us a sneak preview of some of the best practices you’ll share in your Subversion Live session?

Mike Lester: Options on when to merge, guidelines of monitoring branches, examples of how project planning must change to do branching and merging and in a controlled manner.

Not signed up yet? Visit http://www.wandisco.com/svn-live-2012 to register, or find out more!

New Refcards: All About Subversion Checkouts and Commits

Need an intro to some essential Apache Subversion commands? We got such great feedback from last month’s branching and merging refcards, that we’ve already put together two more free refcards for the Subversion community.

All About the Apache Subversion Commit Command’ covers everything from the basic “what is a commit?” to more advanced information on editing log messages, ignoring files and directories, and an intro to hook scripts.

Meanwhile, ‘All About Checkouts’ provides a quick reference to making full use of the checkout command and understanding the messages generated under different scenarios. This refcard covers:

  • What is a checkout?
  • Performing a checkout from the command line
  • Performing a checkout with TortoiseSVN
  • How to create a nested folder
  • Changing the checkout file data

We’ve got even more refcards lined up for the coming weeks, so be sure to keep checking back for all the latest free training content. And if you’ve got an idea for a Subversion refcard, please don’t hesitate to Contact Us.

Need more Subversion know-how? After getting a great response from the Apache Subversion community in 2011, Subversion Live is back for 2012, bringing the Subversion community sessions covering everything from Subversion’s future, to expert-led best practices workshops, as well as the unique opportunity to meet the core Subversion committers.

WANdisco’s July Roundup

As an active member of the ASF and Apache Subversion communities, this month we were excited to announce that our sponsorship of the Apache Software Foundation will continue for a second year in a row. As an ASF sponsor WANdisco joins companies such as Google, Facebook, Yahoo!, HP and IBM.

The ASF Sponsorship Program is the official avenue for substantial, non-directed monetary contributions to the ASF, and funds raised through this program help the Foundation maintain leadership in the developer and open source communities.

Not content with continuing and upgrading our sponsorship, we increased the number of full-time Subversion committers by hiring two of the most experienced Subversion engineers in Branko Čibej and Stefan Fuhrmann. Branko Čibej joined the Subversion project in May 2000 and has been an active member of the community since then. He will take up the role of Director of Subversion at WANdisco.

“Apache Subversion is entering an interesting phase in its development,” said Branko. “The changes in the latest release have laid the groundwork for a slew of important new features, and I’m grateful to WANdisco for giving me the opportunity to work full-time on the project as their Director of Subversion.”

Also joining WANdisco as a full-time Subversion developer is Stefan Fuhrmann. Stefan has been involved in the Apache Subversion project since 2010, and has worked on the TortoiseSVN project since 2003.

We also saw two IBM veterans – Paul Hewitt and Scott Rudenstein –join WANdisco’s sales management team. Paul Hewitt brings more than 25 years of software industry experience to his new position as WANdisco’s Sales Director for EMEA. Paul spent 10 of those 25 years at IBM Telelogic where he rose from the rank of Principal Account Manager to become UK Managing Director and Senior Vice President for Western Europe. After assuming this leadership position, Paul was able to grow Telelogic’s revenue by more than 50%.

Meanwhile, Scott Rudenstein brings over 20 years of industry experience to his new position as Director of Technical Sales and Services at WANdisco. Scott spent over 5 years as a Senior Sales Engineer in the IBM Rational Software Group specialising in software development tools. Scott was a member of the Rational Software team that was acquired by IBM for $2.1bn in February 2003. Scott has also held various Sales Director positions at US-based software companies such as Quest Software and Surgient.

We’d like to take this opportunity to welcome all our new starters to WANdisco! Want to join them? There’s still plenty of job opportunities at our Careers page.

This month, we set out to investigate which Apache Subversion client is most popular, with a poll that asked what clients – if any – the SVN community are using. The results are in and, according to respondents, there’s a clear winner in this popularity contest as over 60% of respondents said they were using TortoiseSVN.

TortoiseSVN is a free Windows client for Subversion – if you want to find out more about what TortoiseSVN has to offer, why not take a look at our ‘Top Ten Reasons To Try TortoiseSVN’ blog post? If you want to find out what all the fuss is about for yourself, we also have a handy starter guide: ‘How to Install TortoiseSVN and Make Your First Repository Change.’

After the success of 2011’s conference, Subversion Live is back for 2012! Subversion Live 2012 will take place in San Francisco (October 10th & 11th) Greenwich, Connecticut (October 16th & 17th) and London (October 23rd & 24th) and for a limited period registrants can get a 25% discount with our Early Bird offer.

This series of two-day conferences will feature a unique mix of expert-led best practices workshops, live Subversion demos and invaluable networking opportunities with experienced peers. Attendees will also have the opportunity to meet core Subversion committers, including Greg Stein, Stefan Fuhrmann, Julian Foad and Philip Martin.

Registration is now open – and don’t forget to enter the ‘earlybird’ code to claim your 25% discount.

After more training, but can’t wait until Subversion Live 2012? After getting plenty of requests from the community for more webinars on branching and merging, not only have we added another free training webinar on branching and merging but we’ve created some handy Subversion refcards.

Introduction to Merging in Apache Subversion’ starts with the basic question of ‘what is merging,’ before showing you how to perform the different types of merges, including reverse merges, and finally sharing some best practices to help you avoid merge hell, while ‘Introduction to Branching in Apache Subversion’ covers the essential know-how you need to get started with branching. This refcard covers:

  • What is a Branch?
  • How to Create a Branch
  • Identifying Branches
  • Deleting Branches

We’ll be adding more refcards over the coming weeks, so keep checking back for even more free training content.