Separate branch for experimental)

[Kumar Appaiah]

Dear vcs-pkg,

I've got an interesting problem, for which the Git users here might
have a nice solution.

I have a package, which is meant for unstable. Now, because of the
gfortran transition, I want to upload the package, with modfications
to experimental. This involves renaming some .install and .docs files
in debian/, and editing the control file. OK till now, except that if
upstream makes a new release, I'll have to somehow revert the changes
to the older versions (pre-exeperimental upload), and keep the
changelog with the experimental entry intact, switch back, and create
a new experimental upload. This reverting, re-reverting etc. is the
part I want to see how to solve.

Right now, I have only two branches, upstream and master, as I adopted
a rather simplistic approach to packaging. Could you suggest a way by
which this problem can be "decently" handled with branches (or
otherwise) in git?

Thanks.

Kumar
-- 
Kumar Appaiah,
458, Jamuna Hostel,
Indian Institute of Technology Madras,
Chennai - 600 036