[Gnu-arch-users] Tla spork

[James Blackwell]

In lists.arch.users, you wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi,
>
> I can't seem to find a clear how-to to do these two simple tasks:
>
> 1. Creating a branch
>       Assume you're cd'ed to a tree with a branch "old-branch" from which you 
> want 
> to create a new branch "new-branch". I always use --0 as version numbers, so 
> let's ignore them for now. The best method I have been able to find is:
>
> $ tla tag -S project--new-branch--0
>
>       Is that the best way to do this? I must say that I dislike using "tag" 
> as the 
> non-existing command "create-branch", but other than that the above method is 
> fine, if a bit hard to find. 

Yes, this is the best way to do this. We use "tag" instead of
"create-branch" because we already use the name branch.

At a conference the other night, ddaa and I were talking about the
problem with the name of the tag command. He suggestioned something
reasonable that I didn't agree with.

I suggested "tla spork".

Let's say you perform the following: 

1. get somebody else's version
2. cd into it
3. hack, hack, hack
4. Commit. Whoops, we can't commit. Not our version
5. tla --spork [optional local version]

tla spork does all the tla tag, join-tree etc stuff that turns his
working copy into your working copy.
 
Sure, I originally meant it as a joke, but as the wide assortment of
english speaking non-americans started laughing at the joke, I realized
that it might be a really good idea! 

The problem with "tla fork" as a command is that the word sounds much
too deep and serious. "Ohhh. I don't want to fork this guy. I just want
to work on my local copy". A spork, on the other hand, is one of
humanity's best jokes. Even better, conceptually, a "spork" is basically
a fork with really shallow prongs. 


> 2. Joining/switching to a branch
>       Let us assume I've a project tree on some branch "branch-apple" and 
> want to 
> switch to another branch "branch-cheese", which somewhere will have a common 
> ancestor. Below is the only method I've managed to make work. There has *got* 
> to be a better way:
>
> $ cd ..
> $ rm -rf project
> $ tla get project--branch-cheese project
> $ cd project
> $ rebuilt Makefiles and other temporary files from scratch.
>
> Please help.... I'll then add then answers to the Wiki, so the next user will 
> be able to find this info. 
>
> Thanks.
>
> - -- 
> regards, Esben
>
> Homepage: http://www.mosehansen.dk
> Signature fingerprint at http://www.mosehansen.dk/about
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.2.4 (GNU/Linux)
>
> iD8DBQFBGfqPrfnftt13wXIRAhgCAJ0csvhqwBri4GTAUvFNKgKKDp+IuQCfZ4Qk
> g9keW2tV9/PpNYNqw+57Z1s=
> =w2xy
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Gnu-arch-users mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnu-arch-users
>
> GNU arch home page:
> http://savannah.gnu.org/projects/gnu-arch/
>


-- 
James Blackwell          Try something fun: For the next 24 hours, give
Smile more!              each person you meet a compliment!

GnuPG (ID 06357400) AAE4 8C76 58DA 5902 761D  247A 8A55 DA73 0635 7400