gnucash-htdocs branch master updated. svn_last-505-ga286032

[Geert Janssens]

For those curious to what happened here:
This (and the next) push are part of an experiment to reset the beta branch to the current 
master/trunk branch using git features.

The following commands were executed:
1. git checkout master
2. git merge -s ours beta
(pushed the master branch to gitolite afterwards)
3. git checkout beta
4. git reset --hard master
(pushed beta branch afterwards

Some background for the experiment:
In svn we had a trunk branch and a beta branch. The trunk branch represents the live 
website at www.gnucash.org. The beta branch is a branch for testing, visible at 
www.gnucash.org/beta.

The htdocs README file states that beta should be updated to whatever trunk is before 
starting any serious experiments. In svn this was typically done by copying the current data 
from the most recent trunk commit to beta and check this in. That sort of works for the 
limited use case of the website, but svn has no idea you actually reset beta to trunk. The two 
branches remain to separate, independent branches as far as svn is concerned.

I believe it is more beneficial if the revision history reflects your intended actions and so I 
tried if this could be done in git. This experiment is one attempt to have the git history reflect 
that beta was reset to master. If you look at the history in git at this moment, it will show you 
that we have the two branches merged together, meaning they point at the same commit 
currently.

I'm not fully happy with this though. What we lose here is the knowledge of which of the two 
merged branches was master and which one was beta. Suppose for some reason we have to 
revert back to a commit where the two were not merged together yet. Which branch was 
master and which one was beta ?

So I'm wondering how to deal with this. Add a tag to the last commits right before merging ? 
Use a different merge strategy that allows us to keep two independent branches ? Ideally a 
'git merge -s theirs master' on the beta branch would do that, but that doesn't seem to exist.

Geert

On Wednesday 29 May 2013 04:50:06 Geert Janssens wrote:
> The master branch has been updated
>        via  https://github.com/Gnucash/gnucash-htdocs/commit/a2860322
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/08f4b14e
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/3d5449be
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/ff4d9f7a
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/84ae2208
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/1c6a32fa
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/22890e70
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/9fb799d5
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/4f459a87
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/af52c002
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/5eca1cb6
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/d9868cde
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/96ab32f9
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/68d285d6
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/2c48c703
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/bbfd4b12
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/be75eed8
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/0a1a5a06
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/8defa36b
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/38f96c5e
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/5a442c02
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/02c63a76
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/b5e7f346
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/a784a5a2
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/050022f9
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/cd3ddcd0
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/814320b5
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/33a533e9
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/d9c9658f
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/71ee3aaa
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/6a601aef
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/641a3b9b
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/36cec559
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/12448eb3
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/03dbbdb2
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/18c38240
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/e658326c
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/36ddfedb
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/4f46dc97
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/1347a6a0
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/b2958458
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/072ecf30
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/06c0cc52
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/cccee0c5
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/bf99f46d
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/542f1968
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/6747896c
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/44613444
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/553831e3
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/12c872d4
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/b71d9718
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/92480bb9
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/fc38d3f8
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/fa54a616
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/df89fa29
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/a8894043
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/42d7eb19
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/42f0b861
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/c6d918b4
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/c1ae0feb
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/8eedabe3
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/8a654ea7
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/6a30d751
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/ac7ff5c7
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/c5af978e
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/c14d6d71
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/bb0a6a37
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/5ebe92e0
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/fd1fee91
> (commit) via  https://github.com/Gnucash/gnucash-htdocs/commit/184b95e4