[Adium-devl] Status of the 1.2svn search field?

[Juan Manuel Palacios]

On Sep 5, 2007, at 12:58 PM, Juan Manuel Palacios wrote:

>
>
> 	Lastly, what is that patch Augie is working on for? Subversion
> itself? Other than dealing with a large and complex tree, this
> merging process is no different from many others that take place
> daily (imagine the gcc tree!), so I guess I don't understand why what
> seems to me like so many preparations are underway (please do correct
> me if I'm wrong). Conflicts will arise at merge time and people in
> control of branches have to deal with them, just as in any other
> merge. All this business would have been easier from the start if
> svnmerge.py had been used, but it is just occurring to me that,
> should you guys decide to give it a go, we could still try to go down
> that path. Trust me, it simplifies the merge process a great deal by
> keeping a record of what has been merged already and what is still
> pending (on a revision per revision basis); you can also block things
> from being merged (thus disappearing from the pending list), do
> bidirectional merges and "record only" merges (for stuff that has
> been merged manually already), so as you can see the tool can be
> quite flexible. All in all, I really recommend it!
>


	Replying to my own message: one thing I forgot to say about  
svnmerge.py is that you can hand-pick what revision you use to  
initialize the "merge record", the one that tells you what revisions  
you have available to merge in. So say your tree is at r10 and you  
have both trunk and a branch, which was created at r5 but you only  
initialized with svnmerge.py at r10 (the initialization itself  
creates a revision). You don't necessarily have to loose merge info  
for r6 through 9 and start off tracking revisions at the next to come  
r11; instead, you can tell svnmerge.py to initialize the record at r6  
and start keeping track for you from there on. This is the very  
reason why I say we may still be able to work with this tool should  
the powers that be decide too.

	In any case, I vouch for it 'cause I've been using it to handle the  
MacPorts release branches and it's proven very useful to me, I no  
longer have to grab a piece of paper and write revision numbers while  
I type on my terminal ;-)

	Regards,...


-jmpp