Right, if you look at the conflicting
auto_analyses/dauvergne_protocol.py file, you will see:
<<<<<<< .working
def __init__(self, save_dir=None, diff_model=None,
mf_models=['m0', 'm1', 'm2', 'm3', 'm4', 'm5', 'm6', 'm7', 'm8',
'm9'], local_tm_models=['tm0', 'tm1', 'tm2', 'tm3', 'tm4', 'tm5',
'tm6', 'tm7', 'tm8', 'tm9'], pdb_file=None, seq_args=None,
het_name=None, relax_data=None, unres=None, exclude=None,
bond_length=None, csa=None, hetnuc=None, proton='1H', grid_inc=11,
min_algor='newton', mc_num=500, max_iter=None, user_fns=None,
conv_loop=True):
=======
def __init__(self, diff_model=None, mf_models=['m0', 'm1', 'm2',
'm3', 'm4', 'm5', 'm6', 'm7', 'm8', 'm9'], local_tm_models=['tm0',
'tm1', 'tm2', 'tm3', 'tm4', 'tm5', 'tm6', 'tm7', 'tm8', 'tm9'],
pdb_file=None, seq_args=None, het_name=None, attached_name='H',
relax_data=None, unres=None, exclude=None, bond_length=None, csa=None,
hetnuc=None, proton='1H', grid_inc=11, min_algor='newton', mc_num=500,
max_iter=None, user_fns=None, conv_loop=True):
.merge-right.r11385
This is how conflicts are reported. The reason will be because this
line has changed in both branches, so that the merging process does
not know what to do. In your branch, you have added the arg:
save_dir=None
Whereas in the 1.3 line I have added:
attached_name='H'
So we need to combine the two:
def __init__(self, save_dir=None, diff_model=None,
mf_models=['m0', 'm1', 'm2', 'm3', 'm4', 'm5', 'm6', 'm7', 'm8',
'm9'], local_tm_models=['tm0', 'tm1', 'tm2', 'tm3', 'tm4', 'tm5',
'tm6', 'tm7', 'tm8', 'tm9'], pdb_file=None, seq_args=None,
het_name=None, attached_name='H', relax_data=None, unres=None,
exclude=None, bond_length=None, csa=None, hetnuc=None, proton='1H',
grid_inc=11, min_algor='newton', mc_num=500, max_iter=None,
user_fns=None, conv_loop=True):
and delete the other line, remove the "<<<<<<< .working", "=======",
and ">>>>>>> .merge-right.r11385", and then say that the conflict is
resolved:
$ svn resolved auto_analyses/dauvergne_protocol.py
And then this works:
$ svn ci -F svnmerge-commit-message.txt
You will see that I have committed this change.
Regards,
Edward
On 3 August 2010 08:54, Edward d'Auvergne <edward@xxxxxxxxxxxxx> wrote:
Ok, I'll have a look.
Regards,
Edward
On 3 August 2010 03:12, Michael Bieri <NO-REPLY.INVALID-ADDRESS@xxxxxxx>
wrote:
Follow-up Comment #59, task #6847 (project relax):
Hi Edward
i tried to merge the 1.3 line in this one. Unfortunately, there was a
conflict this time:
$ svnmerge merge
/usr/bin/svnmerge:71: DeprecationWarning: The popen2 module is deprecated.
Use the subprocess module.
import sys, os, getopt, re, types, tempfile, time, popen2, locale
property 'svnmerge-integrated' deleted from '.'.
--- Merging r11381 through r11385 into '.':
U generic_fns/pipes.py
U generic_fns/align_tensor.py
U scripts/code_validator
U sample_scripts/full_analysis.py
U specific_fns/frame_order.py
C auto_analyses/dauvergne_protocol.py
Summary of conflicts:
Text conflicts: 1
property 'svnmerge-integrated' set on '.'
I can't commit the merging now!
Cheers
Michael
_______________________________________________________
Reply to this item at:
<http://gna.org/task/?6847>
_______________________________________________
Nachricht geschickt von/durch Gna!
http://gna.org/
Re: [task #6847] The Bieri graphical user interface.