Re: [Gnu-arch-users] star merging from other archives

[Aaron Bentley]

John Meinel wrote:
> It is being worked on. Tom has some pretty grand plans. Something 
> about hats where your aliases try to make sense depending on what 
> project you are in, etc.

James Blackwell has some code.  Not sure what the state of native 
aliases is.

> Both of that being said, aba & fai both have aliases. 

Fai's support for creating and manipulating aliases has recently been 
improved.  Just this morning, I committed tab-completion for alias 
manipulation.  Fai also supports automatic aliases for things like "the 
archive-current revision" and "the last revision that modified this file".

> And if you setup 
> tla-bash-complete a lot of the typing is taken care of.
> Also you might want to look into "aba merge"
> You create a list of "friends" in the file {arch}/=partner-versions
> And then "aba merge" will do a star-merge with each one until something 
> changes. Then it will stop, pop up the changelog, and basically be ready 
> for committing.

Fai's merge is similar.  It handles more cases than star-merge, (and aba 
merge, which uses star-merge) and generates the changelog when you run 
elog (or when you commit) instead of doing it automatically.  If you're 
merging from the version you tagged from, you don't even need 
[=+]partner-versions.

Aaron

--
Aaron Bentley
Director of Technology
Panometrics, Inc.