[jifty-devel] SVK misery
Edgar Whipple
jifty at misterwhipple.com
Fri Feb 23 23:27:10 EST 2007
On Fri, 2007-02-23 at 23:06 -0500, Edgar Whipple wrote:
> Okay, clearly I'm doing something wrong with SVK. I committed my change
> to the template fragments in the ModelBuilder plugin, virtual-models
> branch. Where everyone else gets a nice little concise log entry in the
> repository, I get three pages showing everything I ever did, plus half a
> dozen other people's work. I don't get it.
>
> Here's one of the log entries in question:
>
> http://svn.jifty.org/index.cgi/jifty/log/jifty/branches/virtual-models/plugins/ModelBuilder/share/
>
> I'll send along the sequence of svk command-lines in a few minutes.
Here is the sequence of command-lines I ran that produced the awful log
entry referenced above. I'll be grateful if anyone can point out my
mistake.
For background: Using svk, I have a mirror of the svn jifty repository
in //mirror/jifty, and a local copy in //local/jifty.
###### Begin history
svk sync --all //mirror
svk pull --all //local
## snipped: commands to build, install, test patched virtual-models
cd svk-checkouts/jifty/
svk status|grep -v '^\?'
svk status
svk help commit
svk commit -C .
## resync just to be sure no more changes crept in
svk sync --all //mirror
svk pull --all //local
svk commit -C -m "Rename label to label_text in ModelBuilder template
fragments" .
svk commit -m "Rename label to label_text in ModelBuilder template
fragments" .
svk push -l //local/jifty/branches
##### End history
I've attached the unreasonably long output from 'svk commit'.
Edgar
--
ln -s /dev/null ~/.sig
-------------- next part --------------
Auto-merging (0, 2753) /local/jifty/branches to /mirror/jifty/branches (base /mirror/jifty/branches:2209).
Merging back to mirror source http://svn.jifty.org/svn/jifty.org/jifty.
U virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/update
U virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/new
U virtual-models/plugins/ModelBuilder/share/web/templates/__jifty/builder/model/fragments/column/view
g virtual-models/AUTHORS
g virtual-models/Makefile.PL
g virtual-models/t/TestApp/t/upgrade.t
g virtual-models/t/TestApp/lib/TestApp/Model/User.pm
g virtual-models/t/TestApp/lib/TestApp/Upgrade.pm
g virtual-models/lib/Jifty.pm
g virtual-models/lib/Jifty/Web.pm
g virtual-models/lib/Jifty/Test.pm
g virtual-models/lib/Jifty/Upgrade.pm
g virtual-models/lib/Jifty/Script/Schema.pm
g virtual-models/lib/Jifty/Action/Record.pm
g virtual-models/lib/Jifty/Action/Autocomplete.pm
g virtual-models/lib/Jifty/API.pm
g virtual-models/lib/Jifty/Action.pm
g virtual-models/lib/Jifty/Record.pm
g virtual-models/lib/Jifty/Model/Metadata.pm
G virtual-models
g template-declare/AUTHORS
g template-declare/Makefile.PL
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/model/dhandler
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/model
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/autohandler
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/fragments/list/update
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/fragments/list/search
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/fragments/list/new_item
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/fragments/list/header
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/fragments/list/view
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/fragments/list/list
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/fragments/list
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/fragments
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/index.html
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/_elements/nav
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/_elements
g template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/action/dhandler
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin/action
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty/admin
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates/__jifty
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web/templates
G template-declare/share/plugins/Jifty/Plugin/AdminUI/web
G template-declare/share/plugins/Jifty/Plugin/AdminUI
g template-declare/share/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs/autohandler
g template-declare/share/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs/toc.html
g template-declare/share/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs/index.html
g template-declare/share/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs/content.html
G template-declare/share/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty/online_docs
G template-declare/share/plugins/Jifty/Plugin/OnlineDocs/web/templates/__jifty
G template-declare/share/plugins/Jifty/Plugin/OnlineDocs/web/templates
G template-declare/share/plugins/Jifty/Plugin/OnlineDocs/web
G template-declare/share/plugins/Jifty/Plugin/OnlineDocs
G template-declare/share/plugins/Jifty/Plugin
G template-declare/share/plugins/Jifty
G template-declare/share/plugins
g template-declare/share/web/transform_templates
g template-declare/lib/Jifty.pm
g template-declare/lib/Jifty/Handler.pm
g template-declare/lib/Jifty/Web.pm
g template-declare/lib/Jifty/Test.pm
g template-declare/lib/Jifty/Script/Adopt.pm
g template-declare/lib/Jifty/Script/Env.pm
g template-declare/lib/Jifty/Script/Schema.pm
g template-declare/lib/Jifty/ClassLoader.pm
g template-declare/lib/Jifty/Plugin.pm
g template-declare/lib/Jifty/Manual/TutorialRest.pod
g template-declare/lib/Jifty/Manual/Tutorial.pod
g template-declare/lib/Jifty/Manual/Cookbook.pod
g template-declare/lib/Jifty/Action/Record.pm
g template-declare/lib/Jifty/Action/Autocomplete.pm
g template-declare/lib/Jifty/Config.pm
g template-declare/lib/Jifty/API.pm
g template-declare/lib/Jifty/Action.pm
g template-declare/lib/Jifty/Logger.pm
g template-declare/lib/Jifty/CurrentUser.pm
g template-declare/lib/Jifty/Plugin/AdminUI.pm
g template-declare/lib/Jifty/Plugin/Halo/View.pm
G template-declare/lib/Jifty/Plugin/Halo
g template-declare/lib/Jifty/Plugin/AdminUI/View-not-yet.pm
G template-declare/lib/Jifty/Plugin/AdminUI
g template-declare/lib/Jifty/Plugin/CompressedCSSandJS.pm
g template-declare/lib/Jifty/Plugin/OnlineDocs.pm
g template-declare/lib/Jifty/Plugin/CompressedCSSandJS/Dispatcher.pm
G template-declare/lib/Jifty/Plugin/CompressedCSSandJS
g template-declare/lib/Jifty/Plugin/OnlineDocs/View.pm
g template-declare/lib/Jifty/Plugin/REST/Dispatcher.pm
g template-declare/lib/Jifty/Plugin/Yullio/View.pm
G template-declare/lib/Jifty/Plugin/Yullio
g template-declare/lib/Jifty/Plugin/Halo.pm
g template-declare/examples/Chat/etc/config.yml
G template-declare
New merge ticket: e9249f30-f429-0410-9f28-aaf713556287:/local/jifty/branches:2753
Merge back committed as revision 2835.
Syncing http://svn.jifty.org/svn/jifty.org/jifty
Retrieving log information from 2835 to 2835
Committed revision 2754 from revision 2835.
More information about the jifty-devel
mailing list