Re: Unbranching gnome-docs?

[Brent Smith <gnome nextreality net>]

Joachim Noreiko wrote:
> Is there any chance we could remove the 2.14 branch
> from the user-guide, or is a branch across a whole
> module?
>
> I don't anticipate doing anything other than work 2.14
> features that didn't get into the release, so
> everything will apply to HEAD too.
> I'm assuming there will be a 2.14.1 release of the
> docs. In light of Ubuntu's delayed release, I think
> it's particularly important to get more work done on
> the current version of the guide.
>
> Things like cleaning up the repository will wait until
> we move to SVN (and that's been delayed). Cleaning IDs
> and importing other manuals can come later on too.
>
> Working on two branches is going to do my head in. I
> already asked on IRC whether there's some way to only
> work on one local copy & automatically commit to both
> the branch and HEAD, but it seems not.

Just work on HEAD.  We can generate a diff of everything you
do on head since the branch point and then just apply that to
the gnome-2-14 branch.

--
Brent Smith <gnome nextreality net>
IRC: smitten