[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Pulling in changes from another archive
From: |
Parker, Ron |
Subject: |
[Gnu-arch-users] Pulling in changes from another archive |
Date: |
Thu, 1 Jul 2004 18:03:40 -0500 |
I may just need something to eat, but I have an archive checked out and I
want to pull in changes from another archive. Shouldn't it be as easy as
doing the following?
$ cd my-tla-stuff/src/hackerlab
$ tla star-merge address@hidden/hackerlab--pika-escapes--1.0
This get's me the following:
$ tla star-merge address@hidden/hackerlab--pika-escapes--1.0
* build reference tree for
address@hidden/hackerlab--pika-escapes--1.0--patch-2
* from archive cached:
address@hidden/hackerlab--pika-escapes--1.0--patch-2
star-merge: unable to merge unrelated trees.
If I first:
$ tla add-log-version address@hidden/hackerlab--escapes--1.0
$ tla add-log-version
address@hidden/hackerlab--pika-escapes--1.0
Then I get:
$ tla star-merge address@hidden/hackerlab--escapes--1.0
* build reference tree for
address@hidden/hackerlab--escapes--1.0--patch-18
* from archive cached:
address@hidden/hackerlab--escapes--1.0--base-0
* patching for revision:
address@hidden/hackerlab--escapes--1.0--patch-1
arch_apply_changeset: internal error (patch(1) returned odd status)
patch(1) exit status: 2
patch: **** Can't open patch file
/home/rdparker/src/tla-rdp/src/hackerlab/,,star-merge.1088717473.2856.1/,,ha
address@hidden/,,n
ext-patch.1088717489.2856.6/patches/./char/dstr.c.patch : No such file or
directory
I am perfectly willing to believe that the patch error is the result of
playing with the pathcompress changes, but
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnu-arch-users] Pulling in changes from another archive,
Parker, Ron <=