[emacs-wiki-discuss] Re: Arch tutorial 1: Getting Started With Arch

[Magnus Henoch]

Yamagata Yoriyuki <address@hidden> writes:

> I'm now stuck changing the primary repository from
> address@hidden to address@hidden I'm
> sure I'm doing something stupid, but maybe it would be a good idea to
> add the method of changing the archive to your tutorial, if you plan to
> change the archive every year.
>
> First, let me explain what I have done so far.  Since I want to change
> emacs-wiki-journal substantially, I had prepared my own archive which
> based on your 2004 archive.  Now I want to change the archive to 2005.
> Unfortunately, star-merge fails.
>
> $ tla star-merge address@hidden/emacs-wiki--main--1.0

I think
tla star-merge --reference address@hidden/emacs-wiki--main--1.0 \
  address@hidden/emacs-wiki--main--1.0
would work.  It tells tla to look for an ancestor in the old archive.

Magnus