The commands used were:
svn merge -r18161:18162 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18162:18163 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18207:18208 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18221:18222 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18222:18223 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18236:18237 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18237:18238 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
svn merge -r18238:18239 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
The console messages were:
[edau@... relax-trunk]$ svn merge -r18161:18162 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18162 into '.':
U generic_fns/selection.py
[edau@... relax-trunk]$ svn merge -r18162:18163 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18163 into '.':
G generic_fns/selection.py
[edau@... relax-trunk]$ svn merge -r18207:18208 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18208 into '.':
U user_functions/pcs.py
[edau@... relax-trunk]$ svn merge -r18221:18222 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18222 into '.':
G user_functions/pcs.py
[edau@... relax-trunk]$ svn merge -r18222:18223 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18223 into '.':
U user_functions/rdc.py
[edau@... relax-trunk]$ svn merge -r18236:18237 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/n_state_model.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18237 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18237:18238 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
Conflict discovered in 'specific_fns/n_state_model.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: p
--- Merging r18238 into '.':
C specific_fns/n_state_model.py
Summary of conflicts:
Text conflicts: 1
[edau@... relax-trunk]$ svn merge -r18238:18239 svn+ssh://bugman@.../svn/relax/branches/frame_order_testing .
--- Merging r18239 into '.':
U data/__init__.py
[edau@... relax-trunk]$
