Hi,
I tried to sync the relaxation dispersion branch with the main branch
and got a few errors...
==========================
svnmerge.py avail
9068-9069,9081,9194-9196,9198-9200,9202-9230
==========================
==========================
svnmerge.py merge -r9068-9069,9081,9194-9196,9198-9200,9202-9230
property 'svnmerge-integrated' deleted from '.'.
svnmerge: command execution failed (exit code: 1)
svn --non-interactive propdel "svnmerge-blocked" "."
svn: Attempting to delete nonexistent property 'svnmerge-blocked'
==========================
Typing "svnmerge.py merge" directly gives rise to the same error...
Then, the status of the branch changes, but does not seem to be what I
should expect...
==========================
svnmerge.py avail
svnmerge: no integration info available
==========================
==========================
svn diff
Property changes on: .
___________________________________________________________________
Deleted: svnmerge-integrated
- /1.3:1-9066
==========================
It seems that the merge properties were removed... or something like this...
Do you have any idea ?
Thanks !
Séb :)
--
Sébastien Morin
PhD Student
S. Gagné NMR Laboratory
Université Laval & PROTEO
Québec, Canada
Problem with svnmerge ?