Comments on: TikiFestStrasbourg http://blog.lphuberdeau.com/wordpress/2008/07/tikifeststrasbourg/ Software engineering and anthropology, annectodes, and more. Thu, 03 Nov 2011 15:11:13 +0000 hourly 1 http://wordpress.org/?v=3.3.1 By: Louis-Philippe Huberdeau http://blog.lphuberdeau.com/wordpress/2008/07/tikifeststrasbourg/#comment-172 Louis-Philippe Huberdeau Sat, 20 Dec 2008 17:32:24 +0000 http://blog.lphuberdeau.com/wordpress/?p=156#comment-172 Straight from TikiWiki's repository. https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/trunk/doc/devtools/ Straight from TikiWiki’s repository.

https://tikiwiki.svn.sourceforge.net/svnroot/tikiwiki/trunk/doc/devtools/

]]> By: Pierre Phaneuf http://blog.lphuberdeau.com/wordpress/2008/07/tikifeststrasbourg/#comment-171 Pierre Phaneuf Sat, 20 Dec 2008 16:54:15 +0000 http://blog.lphuberdeau.com/wordpress/?p=156#comment-171 I would have thought that the 1.5 merge-tracking would have been client-side, but apparently you need to update everything. Still, you can use older clients, you just won't be able to do merges without upgrading (not ideal). That said, I'm still using svnmerge.py myself (most of my stuff is on Google Code, so...). svnmerge.py also checks for your client to be clean before doing anything, and it will only do merges from branches that have been "initialized", so it won't do merges that don't make sense. When you do a merge with it, the updated properties are committed along with the merge itself, so if you decide to abort it because there's too many conflicts, "svn revert -R ." at the top will erase all traces that you ever attempted the merge (well, it might leave some files in your working copy, if there was added files, but that's normal), no need to rollback anything else. You can also cherry-pick revisions to be merged, which I'm not a big fan of, but can be pretty handy on occasion, and the next time you do a merge, it'll skip those revisions correctly. svnmerge.py doesn't do anything magical that you wouldn't be able to do yourself with the command-line, so overall, it sounds pretty similar to what your tool does. Is there somewhere I can pick it up? I would have thought that the 1.5 merge-tracking would have been client-side, but apparently you need to update everything. Still, you can use older clients, you just won’t be able to do merges without upgrading (not ideal). That said, I’m still using svnmerge.py myself (most of my stuff is on Google Code, so…).

svnmerge.py also checks for your client to be clean before doing anything, and it will only do merges from branches that have been “initialized”, so it won’t do merges that don’t make sense.

When you do a merge with it, the updated properties are committed along with the merge itself, so if you decide to abort it because there’s too many conflicts, “svn revert -R .” at the top will erase all traces that you ever attempted the merge (well, it might leave some files in your working copy, if there was added files, but that’s normal), no need to rollback anything else.

You can also cherry-pick revisions to be merged, which I’m not a big fan of, but can be pretty handy on occasion, and the next time you do a merge, it’ll skip those revisions correctly.

svnmerge.py doesn’t do anything magical that you wouldn’t be able to do yourself with the command-line, so overall, it sounds pretty similar to what your tool does.

Is there somewhere I can pick it up?

]]> By: Louis-Philippe Huberdeau http://blog.lphuberdeau.com/wordpress/2008/07/tikifeststrasbourg/#comment-170 Louis-Philippe Huberdeau Wed, 17 Dec 2008 16:23:21 +0000 http://blog.lphuberdeau.com/wordpress/?p=156#comment-170 The problem with Subversion 1.5 is that it's not fully deployed yet. Anyone attempting to merge with an older version would break it for everyone else. The scripts we have been using for a few months only write the last merge version number as part of the commit message and look it up. It works great. There are also some safeguards to make sure merges are only made on unmodified working copies and to make sure merges are made from/to branches that make sense. Since 1.5 is introduced, it's meta-data in properties also gets creates. Maybe we'll be able to use it someday, but I think I would still keep the scripts for the safeguards. I tried it and it works nicely for most cases, but the fact that it modifies properties is annoying. Sometimes I attempt to merge and realize there are more conflicts than I can resolve. Usually, I could just revert everything and move on. Now, one must make sure not to forget to rollback the root folder, otherwise, all tracking breaks. The first time I read the documentation for the new feature, sometimes before the release, it really did not make me feel confident about the stability. A little bit like the first presentation I heard about git. The problem with Subversion 1.5 is that it’s not fully deployed yet. Anyone attempting to merge with an older version would break it for everyone else. The scripts we have been using for a few months only write the last merge version number as part of the commit message and look it up. It works great. There are also some safeguards to make sure merges are only made on unmodified working copies and to make sure merges are made from/to branches that make sense. Since 1.5 is introduced, it’s meta-data in properties also gets creates. Maybe we’ll be able to use it someday, but I think I would still keep the scripts for the safeguards.

I tried it and it works nicely for most cases, but the fact that it modifies properties is annoying. Sometimes I attempt to merge and realize there are more conflicts than I can resolve. Usually, I could just revert everything and move on. Now, one must make sure not to forget to rollback the root folder, otherwise, all tracking breaks.

The first time I read the documentation for the new feature, sometimes before the release, it really did not make me feel confident about the stability. A little bit like the first presentation I heard about git.

]]> By: Pierre Phaneuf http://blog.lphuberdeau.com/wordpress/2008/07/tikifeststrasbourg/#comment-169 Pierre Phaneuf Wed, 17 Dec 2008 15:57:35 +0000 http://blog.lphuberdeau.com/wordpress/?p=156#comment-169 You mentioned scripts to do merges... I recommend using this: http://www.orcaware.com/svn/wiki/Svnmerge.py Not only does it work very well, but its process has now been integrated into Subversion 1.5 itself. If your scripts do anything more than that, I'd be interested in finding out if they can help me out? You mentioned scripts to do merges… I recommend using this:

http://www.orcaware.com/svn/wiki/Svnmerge.py

Not only does it work very well, but its process has now been integrated into Subversion 1.5 itself.

If your scripts do anything more than that, I’d be interested in finding out if they can help me out?

]]>