[Pkg-samba-maint] bzr: how to fix cifs-utils upstream branch (including missing tags)?

[Jelmer Vernooij]

On Thu, Jul 26, 2012 at 07:34:05PM +0200, Luk Claes wrote:
> When I was looking at the new upstream version of cifs-utils, I noticed
> that the upstream branch of our cifs-utils repo misses a couple of in
> between upstream versions and tags. I had a look to already fix some
> tags, but I fail to find how to do that. As that does not give me
> confidence that including the missing upstream versions in the upstream
> branch will be trivial, I wondered if I would not better ask the bzr
> experts to handle it for me and spend my time elsewhere.
> 
> Jelmer, Steve, can you please have a look how to fix it, TIA?
It looks like the previous merges of upstream releases weren't
actually done with 'bzr merge-upstream', and the repository doesn't have
revisions with the upstream releases.

We should be creating tags for the upstream release revisions, but
they're present in the repository so I'm not sure what the best fix is
here other than redoing that history.

Cheers,

Jelmer