Re: Problem with svnmerge ? -- July 15, 2009 - 20:50

Hi,

Here it is...


1.
svn co svn+ssh://semor@xxxxxxxxxxx/svn/relax/branches/relax_disp/.
./relax-1.3--relax_disp

2.
cd relax-1.3--relax_disp

3.
ln -s ../minfx .

4.
scons

5.
svnmerge.py avail
    -> 9236-9246

6.a
svnmerge.py merge
6.b
svnmerge.py merge -r9236-9246
    ->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'

7.a
svn diff
    -> Property changes on: .
    ___________________________________________________________________
    Deleted: svnmerge-integrated
       - /1.3:1-9233
7.b
svnmerge.py merge
    -> svnmerge: no integration info available


This is it...
Steps 3 and 4 are not necessary...
Either steps 6.a or 6.b give rise to the same problem...
Then, after either steps 6.a or 6.b, steps 7.a and 7.b give these
strange errors...

Thank you for trying to find out the problem...


Séb  :)



Edward d'Auvergne wrote:
> Could you type out all the steps to reproduce this, from scratch?  If
> I can replicate the problem, I might be able to find the source.
>
> Cheers,
>
> Edward
>
>
>
> On Wed, Jul 15, 2009 at 8:08 PM, Sébastien
> Morin<sebastien.morin.1@xxxxxxxxx> wrote:
>   
> > Hi Ed,
> >
> > I get the same error as yesterday (with both an update copy of the
> > branch and a brand new one)...
> >
> > This is weird and maybe related to subversion (version 1.6.2) or
> > something else...
> >
> > Any idea ?
> >
> >
> > Séb  :)
> >
> >
> >
> >
> > Edward d'Auvergne wrote:
> >     
> > > Hi,
> > >
> > > Is it working now?
> > >
> > > Cheers,
> > >
> > > Edward
> > >
> > >
> > >
> > > On Wed, Jul 15, 2009 at 7:13 PM, Sébastien
> > > Morin<sebastien.morin.1@xxxxxxxxx> wrote:
> > >
> > >       
> > > > Hi,
> > > >
> > > > Thank you for checking this.
> > > >
> > > > I also tried using a new copy of the branch, without success...
> > > >
> > > > Apparently, the Gna server was playing up yesterday...
> > > >
> > > > Regards,
> > > >
> > > >
> > > > Séb  :)
> > > >
> > > >
> > > > Edward d'Auvergne wrote:
> > > >
> > > >         
> > > > > Hi,
> > > > >
> > > > > I just tested everything, and all is ok.  Maybe the svn repository at
> > > > > Gna! was playing up yesterday.  Or maybe you need a new copy of the
> > > > > branch?  But I have now used 'svnmerge.py merge' and committed the
> > > > > merged files.
> > > > >
> > > > > Regards,
> > > > >
> > > > > Edward
> > > > >
> > > > >
> > > > > On Wed, Jul 15, 2009 at 10:42 AM, Edward 
> > > > > d'Auvergne<edward@xxxxxxxxxxxxx> wrote:
> > > > >
> > > > >
> > > > >           
> > > > > > Hi,
> > > > > >
> > > > > > I think this was caused by the merger of the frame_order branch.
> > > > > > There was a problem with the svnmerge.py script and that may have
> > > > > > caused the problem.  I'll try to repair that now.
> > > > > >
> > > > > > Cheers,
> > > > > >
> > > > > > Edward
> > > > > >
> > > > > >
> > > > > > On Tue, Jul 14, 2009 at 5:17 PM, Sébastien
> > > > > > Morin<sebastien.morin.1@xxxxxxxxx> wrote:
> > > > > >
> > > > > >
> > > > > >             
> > > > > > > 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
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > > _______________________________________________
> > > > > > > relax (http://nmr-relax.com)
> > > > > > >
> > > > > > > This is the relax-devel mailing list
> > > > > > > relax-devel@xxxxxxx
> > > > > > >
> > > > > > > To unsubscribe from this list, get a password
> > > > > > > reminder, or change your subscription options,
> > > > > > > visit the list information page at
> > > > > > > https://mail.gna.org/listinfo/relax-devel
> > > > > > >
> > > > > > >
> > > > > > >
> > > > > > >               
> > > > --
> > > > Sébastien Morin
> > > > PhD Student
> > > > S. Gagné NMR Laboratory
> > > > Université Laval & PROTEO
> > > > Québec, Canada
> > > >
> > > >
> > > >
> > > >         
> > >       
> > --
> > Sébastien Morin
> > PhD Student
> > S. Gagné NMR Laboratory
> > Université Laval & PROTEO
> > Québec, Canada
> >
> >
> >     
>
>   


-- 
Sébastien Morin
PhD Student
S. Gagné NMR Laboratory
Université Laval & PROTEO
Québec, Canada