Michael Willmott <mwillmott@leadgenpro.co.uk>


Patch
r866018, r865997

r866018 | dustin | 2007-08-03 11:59:44 -0500 (Fri, 03 Aug 2007)

* svnmerge_test.py
  replace single quotes in self.launch() with double-quotes (Windows compatibility)
  replace multiline expected_output with a regex
  (TestCase_launch): use 'attrib' instead of 'dir' (which is not an executable)
* svnmerge.py
  (construct_merged_log_message) normalize line endings in log message
Patch by: Luke Call <lsuvkne@onemodel.org>
Patch by: Dustin Mitchell <dustin@zmanda.com>
Patch by: Michael Willmott <mwillmott@leadgenpro.co.uk>
Review by: Hernan Martinez Foffani <hernan.martinez@ecc.es>
Review by: Dustin Mitchell <dustin@zmanda.com>


r865997 | dustin | 2007-08-01 15:41:12 -0500 (Wed, 01 Aug 2007)

* contrib/client-side/svnmerge/svnmerge.py
  (initialized_revs): New function
  (analyze_revs, action_avail, action_merge, action_block): Exclude
    initialized revisions when considering candidates, if
    --bidirectional is specified
* contrib/client-side/svnmerge/svnmerge_test.py
  (testBidirectionalMergesMultiBranch): test initialized revision detection
Patch by:  Rich Williams <perldog@gmail.com>
Patch by:  Michael Willmott <mwillmott@leadgenpro.co.uk>
Review by: Giovanni Bajo <rasky@develer.com>