[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnu-arch-users] Merging with the other branches.
From: |
Aaron Bentley |
Subject: |
Re: [Gnu-arch-users] Merging with the other branches. |
Date: |
Fri, 02 Jan 2004 18:17:06 -0500 |
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.6b) Gecko/20031205 Thunderbird/0.4 |
Aneesh Kumar KV wrote:
Hi,
I just started using arch. When merging the changes with the other
trees i was wondering is it possible for getting the changelog also.
I guess it should be possible. I may be missing something.
This is what i did.
1) created test--trunk--0.1 archive
2) created test--branch1--0.1 archive using tla tag.
3) now made changes to test--trunk--0.1 and committed the same to the
archive
4) used tla replay to get the changes in test--branch--0.1
You might want to use star-merge instead of replay.
"tla star-merge test--trunk--0.1"
This will automatically procduce a log entry like this:
address@hidden:~/tlalib$ tla cat-log patch-6
Revision: tlasrc--local--1.2--patch-6
Archive: address@hidden
Creator: Aaron Bentley <address@hidden>
Date: Wed Dec 31 00:40:33 EST 2003
Standard-date: 2003-12-31 05:40:33 GMT
Modified-files: libarch/archive-pfs.c libarch/archive-pfs.h
libarch/archive.c libarch/archive.h
libarch/pfs-signatures.c libarch/pfs-signatures.h
New-patches: address@hidden/tlasrc--local--1.2--patch-6
address@hidden/tla--devo--1.2--patch-44
address@hidden/tla--devo--1.2--patch-45
address@hidden/tla--devo--1.2--patch-46
address@hidden/tla--devo--1.2--patch-47
address@hidden/tla--devo--1.2--patch-48
address@hidden/tla--devo--1.2--patch-49
address@hidden/tla--devo--1.2--patch-50
Summary:
Patches applied:
* address@hidden/tla--devo--1.2--patch-44
actually check md5sums for CONTINUATION and log files
* address@hidden/tla--devo--1.2--patch-45
check md5 of imports, changesets, and cachedrevs
* address@hidden/tla--devo--1.2--patch-46
missing checksum files always warn, sometimes fatally
* address@hidden/tla--devo--1.2--patch-47
signing refinements (see log body)
* address@hidden/tla--devo--1.2--patch-48
back out a bogus approach to signature copying in mirrors
* address@hidden/tla--devo--1.2--patch-49
support for signature-copying mirrors
* address@hidden/tla--devo--1.2--patch-50
signature error checking fixup