Hello Stefano,
On Wed, Apr 01, 2009 at 11:52:24AM +0200, Stefano Zacchiroli wrote:
> On Tue, Nov 11, 2008 at 04:32:08PM +0100, martin f krafft wrote:
> > It would be good to be able to remove a tg branch properly, for
> > instance when upstream included a patch and the topic branch is thus
> > obsolete.
>
> So, I've been hit badly by this, any news on a proper fix?
>
> In the interim, it would be good even to know a work-around. I was
> foolish enough to remove the remote branch after having issued a "tg
> delete" and now my repository at
> http://git.ocamlcore.org/cgi-bin/gitweb.cgi?p=batteries/batteries.git;a=summary
> is screwed, when I do a remote populate I get the following
>
> $ tg remote --populate origin
> tg: Remote origin can now follow TopGit topic branches.
> tg: Populating local topic branches from remote 'origin'...
> tg: Skipping branch debian/missing-doc: Already exists
> tg: Adding branch features/flexi-build...
> fatal: ambiguous argument 'origin/features/flexi-build': unknown
> revision or path not in the working tree.
> Use '--' to separate paths from revisions
> fatal: origin/features/flexi-build: not a valid SHA1
> tg: The remote 'origin' is now the default source of topic branches.
>
> I've no fscking idea of where topgit on the remote repo has stored the
> "features/flexi-build" name. It is not in any .topdeps AFAIK. I would
> be happy with whatever hack that make topgit forget forever that
> branch name because it is not there anymore.
Hhhm, the above repo doesn't seem to have the branches for
debian/missing-doc, is it the right repo?
Anyhow try this:
git push origin :refs/top-bases/features/flexi-build
Most of the time topgit gets an enumeration by looking at the top-bases.
So the above command deletes the corresponding top-base for the failing
branch.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
