Experimental Physics and
Industrial Control System

Ralph Lange <[email protected]> · Fri, 14 May 2010 14:30:05 -0400

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'

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.

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),

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].)

Cheers,
Ralph

[1]

http://www.aps.anl.gov/epics/wiki/index.php/How_to_check_out_EPICS_Base_with_Bazaar

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System