• Do not register here on develop.twiki.org, login with your twiki.org account.
• Use View topic Item7848 for generic doc work for TWiki-6.1.1. Use View topic Item7851 for doc work on extensions that are not part of a release. More... Close
• Anything you create or change in standard webs (Main, TWiki, Sandbox etc) will be automatically reverted on every SVN update.
Does this site look broken?. Use the LitterTray web for test cases.

rdiff merges changes if the changes happend on the same day or maybe hour?

You can try it buy making changes with different users and then use the normal rdiff without parameter (also provided in WebChanges). You will see changes appear as coming from the same user.

AU

I need more specific info (i'd rather be fixing things than trying to figure out how to re-produce it..)

are you sure that its rdiff thats colapsing it, and not the save?

-- SD

  • goto Sandbox and edit a topic with one user
  • goto the same topic right after that and add additional text by a different user
  • look at the WebChanges diffs, which is the normal rdiff bin without any parameters and see that both changes listed under the last user

Did that in Sandbox, see:

and then compare it with:

-- AU

sweet - thanks - its a question of what rdiff is supposed to be shoing when given no parameters - its showing a diff between r1 and the last version right now (i think) -- SD

Ok, I see. In my eyes it does not make much sense to display all changes between the first and the current version - and not under/in the name of the last editor smile

Maybe the last 5 changes or a normal totalhistory is a better default for rdiff. And when changes get merged, all involved authors or none should be listed otherwise a lot people will blame the wrong persons, as they could not see the who made the change actually

-- AU

the attached diff removes the single author if the user intentionally diffs between 2 versions that are further appart, and defaults the rdiff type to history, rather than diff (as this is what cairo did (in error))

CCRB is needed however, as it also changes a makes a string that needs localisation

-- SD

commited svn:7114 due to delay of release-- SD

ItemTemplate
Summary rdiff does merge changes from different users
ReportedBy AndreUlrich
AppliesTo Engine
Priority Urgent
CurrentState Closed
WaitingFor

Topic attachments
I Attachment History Action Size Date Who Comment
Unknown file formatdiff item684.diff r0 manage 2.1 K 2005-10-13 - 15:58 SvenDowideit  
Edit | Attach | Watch | Print version | History: r9 < r8 < r7 < r6 < r5 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r9 - 2005-10-22 - SvenDowideit
 
This site is powered by the TWiki collaboration platform Powered by PerlCopyright © 2008-2019 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback