On Tue, Jul 3, 2012 at 3:40 PM, Brian Foster <brian.foster@xxxxxxxxxxxx> wrote: > On Tuesday 03-July-2012 05:23:29 Hallvard Breien Furuseth wrote: >> Brian Foster wrote: >> > (...) >> > The catch is a desire(? requirement?) that, when the >> > transition ends, people used to using B can continue >> > to use B, people used to using A can continue to use A, >> > and there is no difference. That is, after the end of >> > transition, branch names A and B are the same thing. >> > Always. Automatically. >> > >> > Using a symref seems a working answer. That is, >> > after the merge, change B from a true branch head >> > into a symref pointing to A: >> > >> > git merge ... >> > git symbolic-ref refs/heads/B refs/heads/A >> > >> > ▶ What are the gotchas? >> >> Git clone will turn symref B into a regular branch, >> which will not move in parallel with A. > > Yes, I realize that (and my test script shows it). > But I'm not concerned about it — albeit I've yet > to check with my colleagues — because it matters > only if you _expect_ the two to be identical in > clones at all times. That wasn't the requirement. > The (and I must say I _do_ think this is silly!) > requirement is “People used to using A can still > use A. People used to using B can still use B.” FWIW, we have done a similar thing at $dayjob: A git repo (originally converted form Subversion) still used "trunk" as the main development branch. We wanted to start following Git conventions, so we renamed it to "master", and set up "trunk" as a symref to "master". We then told all the other developers that "trunk" is now "master", and that they should switch at their own leisure. After a grace period, we will remove the "trunk" symref. AFAICS, this seems to work very well. People in old clones keep working on "trunk" for as long as they like. They push their work back to "trunk" on the server, which follows/preserves the symref, and updates the "master" branch. People in new clones get the "master" branch automatically, and push their work directly back to the server's "master". Obviously, all clones also get the other branch when they fetch from the server, but so far nobody has gotten confused by this other branch that "mysteriously" follows their "main" branch. Have fun! :) ...Johan -- Johan Herland, <johan@xxxxxxxxxxx> www.herland.net -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html