[Eric] Subversion

[NARCISO, Rui]

Detlev, thanks so much for a brilliant idea.

Just did as you said and created a multiproject with a project for the trunk and another one for my maintenance branche and it works like a charm.

Thanks again

-----Message d'origine-----
De : detlev [mailto:detlev at die-offenbachs.de] 
Envoyé : lundi 7 juin 2010 18:24
À : eric at riverbankcomputing.com
Cc : NARCISO, Rui
Objet : Re: [Eric] Subversion

On Montag, 7. Juni 2010, NARCISO, Rui wrote:
> That's one way I thought about working.
> Do you do your developments using eric ? 

Of course I am doing eric development with eric (eric4 with eric4 and eric5 
with eric5). I keep the stable release in a separate directory from the trunk 
development. I created a multi project, which is a container for the 
individual projects and added the projects (two eric projects and several eric 
plug-in projects) to this. After that it is just a matter of a double click in 
the multi project viewer to open a project and switch between them.

> if so, when switching between
>  branches do you simply load a different project from file ?
> 
> 
> 
> -----Message d'origine-----
> De : detlev [mailto:detlev at die-offenbachs.de]
> Envoyé : dimanche 6 juin 2010 17:54
> À : eric at riverbankcomputing.com
> Cc : NARCISO, Rui; Jaime Seuma
> Objet : Re: [Eric] Subversion
> 
> On Donnerstag, 3. Juni 2010, NARCISO, Rui wrote:
> > Hi Jaime
> >
> > Thanks for the reply.
> > I completely agree with you and I am in fact currently running my project
> >  using command line subversion.
> >
> > The basics like exporting and committing to/from repository I've managed
> > to do from within Eric. I then went on to create my maintenance branches
> > in parallel of my trunk development.
> >
> > What I'm having troubles is using the eric4 svn plugin to switch between
> >  trunk and maintenance branch efficiently to develop both in parallel ...
> >  hence my question about a tutorial.
> >
> > As you said, all of the tutorials I managed to find only contain the
> > basic stuff which I believe I've gotten the hang of.
> >
> > Rui
> >
> > De : eric-bounces at riverbankcomputing.com
> >  [mailto:eric-bounces at riverbankcomputing.com] De la part de Jaime Seuma
> >  Envoyé : jeudi 3 juin 2010 17:40
> > À : eric at riverbankcomputing.com
> > Objet : Re: [Eric] Subversion
> >
> >
> > On 3 June 2010 13:00, Narciso, Rui wrote:
> >
> > ------------------------------
> >
> > Message: 6
> > Date: Thu, 3 Jun 2010 10:11:57 +0200
> > From: "NARCISO, Rui"
> >  <RUI.NARCISO at airbus.com<mailto:RUI.NARCISO at airbus.com>> To:
> >  "eric at riverbankcomputing.com<mailto:eric at riverbankcomputing.com>"
> >  <eric at riverbankcomputing.com<mailto:eric at riverbankcomputing.com>>
> > Subject: Re: [Eric] subversion
> > Message-ID:
> >
> > 
> > <6454_1275552739_4C0763E3_6454_66_1_7B4A1AAF93133E4986F571C4D269C4CF2B5C8
> >3 893B at DE0-MAILMBX-P13.res.airbus.corp>
> >
> > Content-Type: text/plain; charset="iso-8859-1"
> >
> >
> > Hi
> >
> > Maybe I wasn't clear.
> > I know how to use Eric... I'v been using it for a really long time now.
> >
> > What I was asking for was help on using subversion from within eric.
> >  Creating branches, efficiently switching between branches; merging and
> >  resolving conflicts, etc. I've managed to get the basics: commit,
> >  checkout, diff, but not the advanced stuff ...
> >
> > Cheers
> > Rui
> >
> > I'd go for Subversion first, understand the basics, get the hang of it,
> >  understand the more advanced stuff, get some proficiency with it, and
> > then I'd learn how to use any GUI client (the svn eric4 plugin in this
> > case). What I mean is that it is maybe good to isolate disciplines here.
> > The use of a VCS is -IMHO- a must, but no necessarily for writing code. I
> > use it all the time even for documentation. Once you master the subset of
> > Subversion that is of most use to you, then you'll be able to use it from
> > inside eric4 in not time. That said, in the LogParser tutorial I explain
> > some basic stuff, included the use of the Svn plugin. But of course I
> > didn't want to get into merging, branches and the like. This is Svn
> > stuff, not eric4 stuff.
> >
> > HIH
> >
> > Jaime
> >
> > This mail has originated outside your organization, either from an
> > external partner or the Global Internet.
> >
> > Keep this in mind if you answer this message.
> >
> >
> >
> > The information in this e-mail is confidential. The contents may not be
> >  disclosed or used by anyone other than the addressee. Access to this
> >  e-mail by anyone else is unauthorised. If you are not the intended
> >  recipient, please notify Airbus immediately and delete this e-mail.
> > Airbus cannot accept any responsibility for the accuracy or completeness
> > of this e-mail as it has been sent over public networks. If you have any
> > concerns over the content of this message or its Accuracy or Integrity,
> > please contact Airbus immediately. All outgoing e-mails from Airbus are
> > checked using regularly updated virus scanning software but you should
> > take whatever measures you deem to be appropriate to ensure that this
> > message and any attachments are virus free.
> 
> For eric development I create a branch for a stable release and keep a
>  local working copy of this branch. Development of trunk is done in a
>  separate working copy. This way I don't have to switch back and forth
>  between the branches. If this is the best way to work with subversion can
>  be questioned. However, it works for me.
> 
> Regards,
> Detlev
> 


-- 
Detlev Offenbach
detlev at die-offenbachs.de

This mail has originated outside your organization, either from an external partner or the Global Internet.
Keep this in mind if you answer this message.



The information in this e-mail is confidential. The contents may not be disclosed or used by anyone other than the addressee. Access to this e-mail by anyone else is unauthorised.
If you are not the intended recipient, please notify Airbus immediately and delete this e-mail.
Airbus cannot accept any responsibility for the accuracy or completeness of this e-mail as it has been sent over public networks. If you have any concerns over the content of this message or its Accuracy or Integrity, please contact Airbus immediately.
All outgoing e-mails from Airbus are checked using regularly updated virus scanning software but you should take whatever measures you deem to be appropriate to ensure that this message and any attachments are virus free.