Christopher Lenz wrote:
Am 19.01.2007 um 08:56 schrieb Christian Boos:
Christopher Lenz wrote:
Feedback welcome, in particular on the last part:
> Because this proposal requires moving many files around
> (causing pain when merging), I would prefer doing these
> changes in one big changeset directly on trunk instead
> of updating the branch.
I hope you're not talking about doing that *before* the other
pending branches get merged?
I'm not sure how much of a problem that'd be. The "moving around" is
exclusively about templates, htdocs, and the default wiki pages, i.e.
not the code. Do those branches have any/many changes in those areas?
Lots of changes in the templates, yes.
Given svn's inability to assist the merge after a move, this will be
quite painful to do manually.
I don't see the need to rush for doing that move *right now*, given that
those branches (security, timeline-link-resolver-tmp and
property-renderer-tmp) are in a "ready to merge" status.
-- Christian
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups "Trac
Development" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/trac-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
