3.4. Update the Wireshark sources

After you’ve obtained the Wireshark sources for the first time, you might want to keep them in sync with the sources at the upstream Git repository.

[Tip]Take a look at the Buildbot first

As development evolves, the Wireshark sources are compilable most of the time — but not always. You should take a look at https://buildbot.wireshark.org/trunk/waterfall before fetching or pulling to make sure the builds are in good shape.

3.4.1. Update Using Git

After you clone Wireshark’s Git repository you can update by running

$ git status
$ git pull

Depending on your preferences and work habits you might want to run git pull --rebase or git checkout -b my-topic-branch origin/master instead.

Fetching should only take a few seconds, even on a slow internet connection. It will update your local repository history with changes from the official repository. If you and someone else have changed the same file since the last update, Git will try to merge the changes into your private file (this works remarkably well).

3.4.2. Update Using Source Archives

There are several ways to download the Wireshark source code (as described in Section 3.3, “Obtain the Wireshark sources”), but bringing the changes from the official sources into your personal source tree is identical.

First of all, you will download the new .tar.xz file of the official sources the way you did it the first time.

If you haven’t changed anything in the sources, you could simply throw away your old sources and reinstall everything just like the first time. But be sure, that you really haven’t changed anything. It might be a good idea to simply rename the "old" dir to have it around, just in case you remember later that you really did change something before.

If you have changed your source tree, you have to merge the official changes since the last update into your source tree. You will install the content of the .tar.xz file into a new directory and use a good merge tool (e.g. http://winmerge.sourceforge.net/for Win32) to bring your personal source tree in sync with the official sources again.

This method can be problematic and can be much more difficult and error-prone than using Git.