[Adium-devl] In the meantime, svnmerge to the rescue....?

[Juan Manuel Palacios]

	I'm aware discussion about moving to a DVC is currently underway,  
along tests of the different aspects of each of the various options.  
But there are so many that making a decision might take quite a  
while.... and, in fact, it is already taking a while (though I admit  
I'm not aware of what was discussed at the DVC centered meeting, so  
please excuse me if I'm a bit out of line!).

	So it is with a bit of an outsider's perspective that I suggest that,  
while the final decision is made, svnmerge.py be used to manage the  
branches. Please excuse me also if it's already being employed and  
this mail is just pure noise, but it doesn't seem to me given the  
nature of the common complaints here against subversion's merging  
capabilities and the style of the merge commit logs (which svnmerge.py  
standardizes in a very noticeable style to clearly show what was  
merged/unmerged/blocked/unblocked/etc).

	Ever since I discovered svnmerge.py, the pain of managing MacPorts'  
branches disappeared on the spot (though I admit we don't have those  
many, but then again neither does Adium). All you have to do is "cd / 
path/to/wc/branches/adium-1.2 && svnmerge.py init", and magically from  
there on you'll always have the information of what revisions are  
still pending a merge available to you at the tip of a few keystrokes,  
without having to sift through mail backups or, even worse, diff two  
source trees to try to infer what's still missing! (sounds like I've  
been there before....? ;-)

	A temporary solution such as svnmerge.py being so easy to put to use,  
all I can do is wonder is why it hasn't already. Anything stopping  
Adium devs from using it? I don't think it'd preclude a final move to  
another (D)VCS, in any case...

	Just my 2 cents. Regards,...


-jmpp