usage: fedpkg.py initial-merge [-h] [-n] [repo-path [repo-path ...]]

Performs a 'git merge' of all git branches with the same content
(i.e. with the same package spec files, patch files, etc.), regardless
of their history.

This is useful after Fedora's dist-cvs to dist-git migration, as often
different branches have different histories but the same content on the
filesystem.

After these initial merges of identical trees, future merges between
the branches will be a lot easier: Easier to follow in the dependency
graph, and easier to perform without conflicts.

positional arguments:
  repo-path      Path to a repo to initial-merge

optional arguments:
  -h, --help     show this help message and exit
  -n, --dry-run  Whether to run without actually merging

The function call is evaluated once when the module code is
read. However, the os.getcwd() function might give different
results at run time than at module reading time.

Replaced those default param values with None, and let the
functions call os.getcwd() if the param happens to be None.

Fix string typo in comparison ('feodra')

Fix rawhide branch detection (define .distshort)

Also define PackageModule.distshort for rawhide branches.

Without rpm content, we can't init the packagemodule, so don't try to do
that when switching branches.

It's redundant.