> From: Pau Aliagas <linuxnow@xxxxxxxxxxx>
> > Do you want to simply merge all of the changes on the branch back to
> > the trunk? In that case:
> > % tla get $TRUNK trunk
> > % cd trunk
> > % tla star-merge $BRANCH .
> > ...
> > % tla commit
> This is what I usually want.
> > is a good bet. If you're trying to do something more complicated,
> > then other approaches might be called for.
> > But it's a little weak just to give you a recipe here -- if you're
> > going to work with branches heavily, eventually you'll want to learn a
> > bit about how patch-logs work and how they interact with (especially)
> > replay, star-merge, and sync-tree.
> If I try to cherrypick changesets, shall I run "tla join-branch" to import
> the patch-log? Will it be automaitcally imported when I specify the
> patch-xyz in replay/update?
join-branch will add the base-0 patch-log. You don't need it to cherry-pick.
"Just" consider what `replay --exact' will do:
It will grab the changeset for patch-xyz and apply it to your tree.
Every simple revision (one created with commit) has a changeset that
includes the source changes in that revision, and that adds a new
file: the patch log entry for that revision. So when you apply that
changeset to your project tree, it will add the patch log entry,
creating directories under {arch} as needed.
-t
|
