• 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.

Lynnwood Can anyone tell me if there is a way to get svn NOT to merge changes in a topic that I have edited through TWiki? or I should say not do all the funky >>>>>mine>>>> stuff. i.e. so svn does NOT merge the changes I make locally through TWiki. Every time I run update, it trashes TWikiAdminGroup, TWikiUsers, etc.

MartinCleaver: use pseudo-svnup.pl

CDot the simplest way to resolve it is to move the files you want untouched out of the way, allow the svn update to restore them, then move them back again

(The notes at the top of the script pseudo-svnup.pl has notes in the text about that)

Lavr I am a bit confused now. There is mklinks.sh, pseudo-install.pl, pseudo-install-twiki.pl and pseudo-svnup.pl. What do I run now? and what does the others do?

CDot mklinks.sh is there just for ~develop; ignore it pseudo-install.pl is the one you want (as per the instructions) the others are MC's creations

CDot is trying hard not to delete them for cluttering

MartinCleaver re: pseudo-install.pl - think of this as pseudo-install-plugins.pl then pseudo-install-twiki makes sense: you do pseudo-install-twiki to quickly configure TWiki from SVN: i.e. its writes out *.htaccess, such that then all you need to do is run configure

pseudo-svnup.pl is a workaround to avoid needing to suck all the twiki/twikiplugins changes when you don't care about

Do they clutter? Of course they do, but the others have as much legitimacy as pseudo-install.pl; all of them would disappear from view if they were turned into a (set of) CommandSet .pm usable by TWikiShellContrib.

We can't do this until the shell contrib gets bundled, and that won't happen until we get to Edinburgh release.

Lynnwood   and thanks for addressing this little need!
MartinCleaver   y, well it is security hole to allow SVN to up the TWikiAdminGroup file
MartinCleaver   however, I might change the implementation in the way that CDot noted
MartinCleaver   because one day you will forget and 'svn up'
MartinCleaver   and that *will* merge the changes
MartinCleaver   so its better to move your mods out of the way
MartinCleaver   svn up
MartinCleaver   and move yours back
MartinCleaver   even though you don't really take svn's changes
MartinCleaver   and really we ought note the changes that you don't take
MartinCleaver   no time this week now
MartinCleaver   crazy week

There is no specific requirement stated here. Discarding. CC

Summary Is pseudo* confusing?
ReportedBy MartinCleaver

SVN Range 7747-
AppliesTo Engine
Component BuildScripts
Priority Enhancement
CurrentState No Action Required

TargetRelease major
Edit | Attach | Watch | Print version | History: r5 < r4 < r3 < r2 < r1 | Backlinks | Raw View | Raw edit | More topic actions
Topic revision: r5 - 2006-02-13 - CrawfordCurrie
This site is powered by the TWiki collaboration platform Powered by PerlCopyright © 2008-2018 by the contributing authors. All material on this collaboration platform is the property of the contributing authors.
Ideas, requests, problems regarding TWiki? Send feedback