Nicholas Marriott <nicholas.marri...@gmail.com> writes: > If we have nice history it is a bonus but if it's easier then it'll be > messed up. Why is this a problem? Every change is there at least once, > nothing is lost. What can you no longer do here?
It's fundamentally broken to have every change in there twice, one of which has been discarded by the merge because it was already there. If you checkout any of the intermediate revisions which originated from OpenBSD then tmux doesn't build, because that code doesn't use the osdep_* functions. So you can't bisect. This code shouldn't be there in the first place, only the actual changes that were *only* in OpenBSD should appear in the repository. I know that the merge is correct, i.e. that after the merge (and fixups) the master branch has the latest version of the portable code and 'git log' of each file has only one version. But in six months when I get a bug report about tmux 1.8 and want to see why a given change was made, I'll have to look through history and it won't help to have every commit appear twice... It should be easy enough to use a similar approach to what was previously used, i.e. generate changesets from the OpenBSD CVS history and apply only the ones that aren't in Git. > You can probably rely on the 1.6, 1.7 tags staying stable as well, but > they are a convenience - it's better to use the tarballs. This is what I was doing when the repo used Subversion, I imported tarballs into a Git repository. When we switched to Git I changed the Debian packaging to be based on the new Git repo because it's much more convenient, but if there is no guarantee that the master branch won't be rewound at random times maybe I'll switch back to tarballs. ------------------------------------------------------------------------------ Own the Future-Intel® Level Up Game Demo Contest 2013 Rise to greatness in Intel's independent game demo contest. Compete for recognition, cash, and the chance to get your game on Steam. $5K grand prize plus 10 genre and skill prizes. Submit your demo by 6/6/13. http://p.sf.net/sfu/intel_levelupd2d _______________________________________________ tmux-users mailing list tmux-users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tmux-users
