Re: [Gnu-arch-users] fix "update" when operating on non-default archives

[Cameron Patrick]

James Blackwell wrote:

> > Revision: address@hidden/tla--smallfixes--1.2--patch-1
> Is this supposed to be tla--smallfixes--0--patch-1 ? 

Oops, yes, I'm not doing a very good job of naming my branches consistently...

> > $ tla update address@hidden/tla--devo--1.2
> > * setting aside local changes temporarily
> > * linting the source tree
> > * auto-adding address@hidden/tla--devo--1.2--patch-21 to greedy revision 
> > library /home/cameron/ARCH/revlib
> > corrupt archive
> >   name: address@hidden
> >   location: /archive/ARCH/2004-public
> >   revision: tla--devo--1.2--patch-21
> 
> I don't see this behavior when working with trees that have been
> previously merged? 

That's odd... perhaps my description of what caused it was a bit
wrong.  The problem was, when update did it's "setting aside local
changes" bit by calling arch_cmd_undo, it specified the ancestor
archive with -A, the equivalent of doing

    tla undo -d ,,somewhere -A address@hidden tla--devo--1.2

But undo doesn't get the archive to undo from with -A, it defaults to
the archive of the current working tree instead, so it would look for
tla--devo--1.2 in the archive that my tree is from.

Does that help you reproduce it?

Cameron.

signature.asc
Description: Digital signature