Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  <20102011  2012  2013  2014  2015  2016  2017  2018  Index 2002  2003  2004  2005  2006  2007  2008  2009  <20102011  2012  2013  2014  2015  2016  2017  2018 
<== Date ==> <== Thread ==>

Subject: Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base
From: Benjamin Franksen <benjamin.franksen@bessy.de>
To: core-talk@aps.anl.gov
Date: Fri, 14 May 2010 21:49:41 +0200
On Freitag, 14. Mai 2010, Ralph Lange wrote:
> On Fri 14 May 2010 13:54:10 Ben Franksen wrote:
> > I am astonished. Does Bazaar not have an equivalent of 'darcs
> > unrecord'?
>
> It does: 'bzr uncommit'

Thought so.

> Bazaar will only be able to uncommit from the latest commit backwards to
> a specified revision, as opposed to Darcs that lets you unrecord *any*
> set of patches.

(provided they do not depend on other patches you do not want to unrecord)

> > Or is it rather that you are using the central shared repository for
> > synchronizing home/office work? This is probably not such a good idea.
> > I'd advise to push and pull (or whatever the equivalent operations are
> > named in Bazaar) from your home machine to some private repo (clone) on
> > your office workstation. Being able to do so is one of the main reasons
> > why distributed VCSes have been invented in the first place.
>
> Things might be more complicated when the office workstation is not
> accessible from home (I know that LANL security is somewhat strict),

Oops, didn't hink about that.

> still a private Bazaar branch on LP could be used that way.
>
> > As I think about this, maybe it would be worthwhile to consider a
> > different approach for EPICS base: send patches via email instead of
> > directly pushing to the main shared repo. This is certainly less
> > convenient, but would enable others to review the changes before they
> > get committed to the main repo.
>
> The current approach for EPICS Base is: develop in a public branch, then
> use the Launchpad supported mechanism for reviewing a branch before it
> gets merged into the trunk or release branch. I think that workflow is
> appropriate.
> (See the good explanation of things on the EPICS Wiki [1].)

Very well, I just wanted to mention there are other possibilities. The 
obvious advantage of a public branch is that it is, well, public.

> Cheers,
> Ralph

As well
Ben

References:
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Jeff Hill
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ben Franksen
Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ralph Lange

Navigate by Date:
Prev: Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Andrew Johnson
Next: Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ben Franksen
Index: 2002  2003  2004  2005  2006  2007  2008  2009  <20102011  2012  2013  2014  2015  2016  2017  2018 
Navigate by Thread:
Prev: Re: [Merge] lp:~ralph-lange/epics-base/ca-over-tcp into lp:epics-base Ralph Lange
Next: sequencer beta release Benjamin Franksen
Index: 2002  2003  2004  2005  2006  2007  2008  2009  <20102011  2012  2013  2014  2015  2016  2017  2018 
ANJ, 02 Feb 2012 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·