[Adium-devl] Status of the 1.2svn search field?
evan.s at dreskin.net
Wed Sep 5 17:27:22 UTC 2007
On Sep 5, 2007, at 1:01 PM, Chris Forsythe wrote:
>> What do you need a branch of trunk for? If your intention is to
>> provide a fail safe snapshot of the source tree before the tide
>> arrives, then what you're looking for is really a tag, something by
>> the name of /tags/pre-gsoc2007-merge or anything to that effect.
> So it's easier to merge the searching changes back in.
The real problem is that svn at present has no concept of branches or
merging; branches and tags are the same thing. If svn 1.5 can make
this easy, as Augie indicates it likely can, then one day this sort of
issue won't exist.. I'm holding off on judgement until svn 1.5. Let's
just say I've fallen in love with the propagation abilities of
monotone but like to stick with our current tools if possible.
In any case, ripping out the search stuff and then applying a reverse-
diff to a branch *after* doing all the merges is going to be a lot
less headache than branching to work on searching right before a huge
number of trunk changes.
Furthermore, a reverse-diff doesn't require any special preparation.
Rip the searching stuff out, commit it cleanly, and note the
revisions... svn diff can then provide the changeset at will.
More information about the Adium-devl