I just updated to tla 1.3.1 from 1.3 and get the following error when getting a branch with links to my revision library:
tla get --link m2--enhancement-2434--1
* ensuring library has [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-43
* searching ancestor revision in library in archive [EMAIL PROTECTED]
* no ancestor in library for revision [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-43 in the same archive
* from archive cached: [EMAIL PROTECTED]/m2--trunk--1--patch-172
* patching for revision: [EMAIL PROTECTED]/m2--trunk--1--patch-173
...
* patching for revision: [EMAIL PROTECTED]/m2--trunk--1--patch-190
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--base-0
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-1
...
[EMAIL PROTECTED]/m2--enhancement-2434--1--patch-37
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-38
PANIC: conflict applying patch in arch_build_revision
This happens consistently.
When I switch back to tla 1.3, my revision library gets patched with no problems.
tla get --link m2--enhancement-2434--1
* ensuring library has [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-43
* searching ancestor revision in library in archive [EMAIL PROTECTED]
* no ancestor in library for revision [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-43 in the same archive
* from archive cached: [EMAIL PROTECTED]/m2--trunk--1--patch-172
* patching for revision: [EMAIL PROTECTED]/m2--trunk--1--patch-173
...
* patching for revision: [EMAIL PROTECTED]/m2--trunk--1--patch-190
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--base-0
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-1
...
[EMAIL PROTECTED]/m2--enhancement-2434--1--patch-37
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-38
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-39
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-40
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-41
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-42
* patching for revision: [EMAIL PROTECTED]/m2--enhancement-2434--1--patch-43
* hard linking to library
Is there any info that I can provide to help diagnose the problem? I'm on an updated Fedora Core 3.
Thank you, Armando
_______________________________________________ Gnu-arch-users mailing list Gnu-arch-users@gnu.org http://lists.gnu.org/mailman/listinfo/gnu-arch-users
GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
