openstack-charmers team mailing list archive

Thread
Date

Can you use merge instead of push force?

To: openstack-charmers@xxxxxxxxxxxxxxxxxxx
From: Nobuto MURATA <nobuto@xxxxxxxxxx>
Date: Fri, 30 Jan 2015 11:54:06 +0900
Sender: nobuto@xxxxxxxxxxxxxxxxx

Hi OpenStack charmers,

I really appreciate your continuous effort into openstack charms. It
was a migration day from /next into /trunk(stable) yesterday, I found
some revisions were removed from remote branches[1]. Therefore I
cannot pull directly from current trunk branches, for example
lp:charms/trusty/glance[2]. As far as I subscribe, trusty/glance is
not the only one[3].

Can you please use merge instead of push force? It would be nice if
remote branches keep all histories for better tracking and branch
consumer's experience.

Thanks!

## I'm not subscribing this list,
## please add To: or Cc: to me.

[1]
From:  <noreply@xxxxxxxxxxxxx>
Date: 2015-01-30 0:27 GMT+09:00
Subject: [Branch ~openstack-charmers/charms/trusty/glance/trunk] 1
revision removed

1 revision was removed from the branch.

[2]
$ bzr log -r-1 -n0
------------------------------------------------------------
revno: 79 [merge]
committer: Liam Young <liam.young@xxxxxxxxxxxxx>
branch nick: glance-239474
timestamp: Thu 2014-11-13 10:12:50 +0000
message:
  [corey.bryant, r=gnuoy] Use stable branches for Amulet tests.
    ------------------------------------------------------------
    revno: 76.1.1
    committer: Corey Bryant <corey.bryant@xxxxxxxxxxxxx>
    branch nick: glance
    timestamp: Thu 2014-10-23 18:02:36 +0000
    message:
      Use stable branches for Amulet tests.

$ bzr pull
Using saved parent location:
bzr+ssh://bazaar.launchpad.net/+branch/charms/trusty/glance/
bzr: ERROR: These branches have diverged. Use the missing command to
see how.
Use the merge command to reconcile them.

[3]
lp:charms/precise/cinder: -3
lp:charms/precise/nova-compute: -1
lp:charms/precise/swift-proxy: -1
lp:charms/trusty/ceph-radosgw: -1
lp:charms/trusty/ceph: -1
lp:charms/trusty/cinder: -2
lp:charms/trusty/glance: -1
lp:charms/trusty/heat: -2
lp:charms/trusty/keystone: -1
lp:charms/trusty/nova-cloud-controller: -2
lp:charms/trusty/nova-compute: -2
lp:charms/trusty/quantum-gateway: -2
lp:charms/trusty/rabbitmq-server: -1
lp:charms/trusty/swift-proxy: -2
lp:charms/trusty/swift-storage: -2

-- 
Nobuto MURATA / 村田信人