Thank you too, but....
I think this solution not works for me because the TRAC wiki pages are
not text files.
For view this pages in text files we need do a export command.
I want know if a plug-in could do that, something like this: "*trac-admin
myEnv wiki merge PageA[1:4] PageB* "
Att,
Duany César
On Mon, Jun 2, 2008 at 1:16 PM, <[EMAIL PROTECTED]> wrote:
>
> On Jun 2, 9:01 am, "Duany Espindola" <[EMAIL PROTECTED]> wrote:
> > Thank you, *but* it is not the solution that I'm looking for.
> > This tool works for common files, but I need one that works in wiki-pages
> > into a TRAC environment.
> >
> > Someone have another idea ?
> > --
> > Duany César (Brazil)
> >
> > On Mon, Jun 2, 2008 at 9:08 AM, Jani Tiainen <[EMAIL PROTECTED]> wrote:
> >
> > > Duany Espindola kirjoitti:
> > > > 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.
> >
> > > There is tool called "diff3" that can help you to merge and make
> > > conflicts correctly provided that PageA and PageB do have common
> > > preceding version. See for example <http://en.wikipedia.org/wiki/Diff3
> >
> >
> > > --
> > > Jani Tiainen
>
> I don't understand how this is not a solution to your problem. You
> want to merge/diff, use a merge/diff tool. vimdiff,
> winmerge, ...etc. you just have to point to the actual files of the
> wiki pages instead of at the rendered level. The only other thing I
> can think of, is to do one of the following:
> open both files in edit mode in separate brower windows/tabs and:
> visually merged the changes throught the file, or
> export both to plain text, use a diff tool to see the differences,
> then manually cut and paste the changes into the wiki edit mode
> window(s)
>
> otherwise, I guess I don't fully understand what it is you are trying
> to accomplish by the term "merge".
> >
>
--
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 [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-users?hl=en
-~----------~----~----~----~------~----~------~--~---
