Re: [Gnu-arch-users] Bash completion merge done. Arch rules.

[David Allouche]

On Sat, Jan 10, 2004 at 03:54:06AM -0800, Scott Bronson wrote:
> There was one catch: sync-log only syncs to a single revision.  Since I
> didn't feel like syncing 40 times by hand, I created a new branch
> (tla-bash-complete--flatten--1.0) to flatten the history. I tagged it to
> rwa's base-0 initial revision, then replayed all changes to the end of
> time.  When I committed, I had this project's entire history in a single
> revision.
[snip 7 shell commands]
> 
> Then I copied the now up-to-date files from the
> tla-bash-complete--flatten tree into the bash-complete subdirectory in
> the tlacontrib tree making sure to preserve the inventory ids.
[snip 2 shell commands]
> 
> Then called sync-tree to bring over the gigantic gob of history.
[snip 4 shell commands]
> 
> Now the whole tla-bash-completions tree is a single directory in
> tlacontrib.  All its history has been preserved.  All development will
> move to tlacontrib.

I do not understand why you did that...

What sync-tree does is add all patchlogs from the given revision to the
working dir. All you need to do is use sync-tree _once_ with the last
revision of bash-complete, and it will add all the patchlogs present in
this revision, that is the patchlog of this revision's changeset and all
its ancestors (assuming no patchlogs were deleted in the history).

Assuming tla-bash-complete--sb--1.0 is up-to-date with
tla-bash-complete--rwa--1.0, what you did is essentially equivalent to:

$ tla get address@hidden/tla-bash-complete--sb--1.0 sb
$ cd sb
$ cp -r README TODO gen-tla-commands tla-bash-complete \
../tlacontrib/bash-complete
$ cp .arch-ids/README.id .arch-ids/TODO.id \
../tlacontrib/bash-complete/.arch-ids
$ cd ../tlacontrib
$ tla sync-tree address@hidden/tla-bash-complete--sb--1.0
$ tla log-for-merge >> `tla make-log`
$ tla commit

If sb is _not_ up-to-date with rwa, then what you did is incorrect,
because it will store patchlogs for changes which are not present in the
copied files. You can alway fix that later, but why do complicated and
incorrect when you cand do simple and correct?

-- 
                                                            -- ddaa