Allow the --trunk-only option to be combined with the --options option.
commit394dd18de1a12e1fafa0b973f77b7dc0dde277eb
authormhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087>
Tue, 18 Aug 2009 20:21:41 +0000 (18 20:21 +0000)
committermhagger <mhagger@be7e6eca-30d4-0310-a8e5-ac0d63af7087>
Tue, 18 Aug 2009 20:21:41 +0000 (18 20:21 +0000)
treefd737fa502f35c5256c68243ca9b53076d3f2e90
parentc1e3afbd5c7dab547e67f5b6bec7f7d9cb1236c7
Allow the --trunk-only option to be combined with the --options option.

This is a wish to make the implementation of cvs2bzr easier.

* cvs2svn_lib/run_options.py
  (RunOptions._get_conversion_options_group): Allow the --trunk-only
  option to be combined with the --options option.

  (RunOptions._get_options_file_options_group): Document the change in
  the --options man_help.

git-svn-id: http://cvs2svn.tigris.org/svn/cvs2svn/trunk@4853 be7e6eca-30d4-0310-a8e5-ac0d63af7087
cvs2svn_lib/run_options.py