Re: Problem with svnmerge ? -- July 15, 2009 - 19:14

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