Any time you think "branch/merge" you shouldn't be using a wiki pretty much. There are some wikis that are based about VCSs, but Trac has shied away from that for a long list of reasons (see TighterSubversionIntegration). The Trac project itself is now having problems related to this, and so we are looking to move docs into Subversion for exactly this reason. Hopefully we will be able to produce a workflow and UI for this that other projects can use as well.
--Noah From: trac-users@googlegroups.com [mailto:[EMAIL PROTECTED] On Behalf Of Duany Espindola Sent: Monday, June 02, 2008 10:35 AM To: trac-users@googlegroups.com Subject: [Trac] Re: Merge wiki pages - not a collision solution Thank you Noah! I will do this using svn or "diff and patch" commands. I think more people have de same problem that I have. Maybe I make a plug-in when I take a vacation. Att Duany César (Brazil) On Mon, Jun 2, 2008 at 1:30 PM, Noah Kantrowitz <[EMAIL PROTECTED]> wrote: Check both into subversion and use that (or git, hg, etc). A wiki is not designed for that kind of complex document management. --Noah From: trac-users@googlegroups.com [mailto:[EMAIL PROTECTED] On Behalf Of Duany Espindola Sent: Monday, June 02, 2008 4:08 AM To: trac-users@googlegroups.com Subject: [Trac] Merge wiki pages - not a collision solution Hi, everybody! I have bean looking for a solution for two weeks for my problem and this forum is my last try. I had two equal wiki pages: PageA and PageB. So I make changes in PageA and different changes in PageB. Now I need merge the changes in PageA in the PageB. I read a lot things about merge wiki pages in collision case, but I don't know how to resolve my problem and I will be happy if anyone help me. Att, Duany César (Brazil) -- Duany César S. Espindola --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Trac Users" group. To post to this group, send email to trac-users@googlegroups.com To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/trac-users?hl=en -~----------~----~----~----~------~----~------~--~---
