gnu-arch-users
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Gnu-arch-users] bugfix: update in non-tree root


From: Aaron Bentley
Subject: [Gnu-arch-users] bugfix: update in non-tree root
Date: Thu, 29 Jan 2004 23:59:20 -0500
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.6b) Gecko/20031205 Thunderbird/0.4

When invoked from a subdirectory of a project tree, "tla update" applies the changes to the current directory, not the tree root, causing strange behavior, detailed below. This one-liner changes the default destination for "tla update" to the tree root, instead of the current directory.

address@hidden/tlasrc--local--1.2--patch-36
http://sourcecontrol.net/~abentley/archives/tlasrc/

Or, as a diff:
--- orig/libarch/cmd-update.c
+++ mod/libarch/cmd-update.c
@@ -239,7 +239,7 @@
        arch_copy_project_tree (upon_root, dest, 1, 1);
      }
    else
-      dest = str_save (0, upon);
+      dest = str_save (0, upon_root);

if (arch_valid_package_name (rvsnspec, arch_maybe_archive, arch_req_patch_level, 0))
      {


Here's an example session.

address@hidden:~/tlacontrib-aba/aba$ tlatom tree-root
/home/abentley/tlacontrib-aba
address@hidden:~/tlacontrib-aba/aba$ tlatom changes
* looking for address@hidden/tlacontrib--aba--1.2--patch-12 to compare with * comparing to address@hidden/tlacontrib--aba--1.2--patch-12 address@hidden:~/tlacontrib-aba/aba$ tlatom replay --reverse tlacontrib--aba--1.2--patch-12 * patching for revision address@hidden/tlacontrib--aba--1.2--patch-12 D {arch}/tlacontrib/tlacontrib--aba/tlacontrib--aba--1.2/address@hidden/patch-log/patch-12 D {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden/patch-log/patch-8 D/ {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden/patch-log D/ {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden
D/  {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2
D/  {arch}/tlacontrib/tlacontrib--algernon
M   aba/aba-lib
M   aba/commands/diff
M   aba/commands/diff-rev
M   aba/commands/elog
M   aba/commands/emlog
M   aba/commands/get-diff
M   aba/commands/help
M   aba/commands/merge
M   aba/commands/show-rev
M   aba/commands/tag-this
M   aba/expand-alias
address@hidden:~/tlacontrib-aba/aba$ tlatom update
* setting aside local changes temporarily
* linting the source tree
* reverting changes
* updating for new patches in archive
* finding or making tlacontrib--aba--1.2--patch-11
* finding or making tlacontrib--aba--1.2--patch-12
* computing changeset
A/ {arch}/tlacontrib/tlacontrib--algernon
A/ {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2
A/ {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden A/ {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden/patch-log A {arch}/tlacontrib/tlacontrib--aba/tlacontrib--aba--1.2/address@hidden/patch-log/patch-12 A {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden/patch-log/patch-8
M  aba/commands/diff-rev
M  aba/commands/diff
M  aba/commands/elog
M  aba/commands/emlog
M  aba/expand-alias
M  aba/commands/get-diff
M  aba/commands/help
M  aba/commands/merge
M  aba/aba-lib
M  aba/commands/show-rev
M  aba/commands/tag-this
* changeset: ./,,apply-delta-changeset.1075438159.7512.5
* applying changeset
A/  {arch}/tlacontrib/tlacontrib--algernon
A/  {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2
A/ {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden A/ {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden/patch-log A {arch}/tlacontrib/tlacontrib--aba/tlacontrib--aba--1.2/address@hidden/patch-log/patch-12 A {arch}/tlacontrib/tlacontrib--algernon/tlacontrib--algernon--1.2/address@hidden/patch-log/patch-8
M   aba-lib
M   commands/diff
M   commands/diff-rev
M   commands/elog
M   commands/emlog
M   commands/get-diff
M   commands/help
M   commands/merge
M   commands/show-rev
M   commands/tag-this
M   expand-alias
* reapplying local changes
* linting the source tree
address@hidden:~/tlacontrib-aba/aba$ tlatom changes
* looking for address@hidden/tlacontrib--aba--1.2--patch-11 to compare with * comparing to address@hidden/tlacontrib--aba--1.2--patch-11
D/ aba
D/ aba/.arch-ids
D/ aba/commands
D/ aba/commands/.arch-ids
D/ aba/options
D/ aba/options/.arch-ids
D  aba/.arch-ids/=id
D  aba/.arch-ids/README.id
D  aba/README
D  aba/aba
D  aba/aba-lib
D  aba/aliases
D  aba/commands/.arch-ids/=id
D  aba/commands/diff
D  aba/commands/diff-rev
D  aba/commands/elog
D  aba/commands/emlog
D  aba/commands/full-replay
D  aba/commands/get-diff
D  aba/commands/help
D  aba/commands/merge
D  aba/commands/my-library
D  aba/commands/show-rev
D  aba/commands/tag-this
D  aba/expand-alias
D  aba/options/.arch-ids/=id
D  aba/options/.arch-ids/what-changed.id
D  aba/options/what-changed
address@hidden:~/tlacontrib-aba/aba$






reply via email to

[Prev in Thread] Current Thread [Next in Thread]