gistfile1.txt

k@k0002:~/popego_gitted$ git svn dcommit
Committing to https://svn.popego.com/private/popego/main/trunk ...
        M       popserver/popserver/controllers/api/items.py
Committed r3878
        M       amazon_configs/common/hosts
r3875 = 5f83a21460732c7a631e7d5db81929a61a853e00 (trunk)
        M       popserver/popserver/controllers/api/items.py
r3878 = 7872a0aa8bfda978317675acb179464eae4904f9 (trunk)
W: 18a55fd696eaed8693666e10e4026312a039fe23 and refs/remotes/trunk differ, using rebase:
:040000 040000 7e00e5a77b3a96f503d3681552042986c2b3637b e0f2c91c3582d9722e6802dbf82ae5389ee4b50f M      amazon_configs
First, rewinding head to replay your work on top of it...
HEAD is now at 7872a0a... fixes in items comments controller, escape comments
Applying anonymous comments
.dotest/patch:87: trailing whitespace.

.dotest/patch:91: trailing whitespace.

.dotest/patch:100: trailing whitespace.

.dotest/patch:105: trailing whitespace.

.dotest/patch:110: trailing whitespace.

warning: squelched 31 whitespace errors
warning: 36 lines add whitespace errors.
        M       popserver/popserver/controllers/api/items.py
        M       popserver/popserver/public/popui/comment-panel/comment-panel.mako
        M       popserver/popserver/public/popui/popui-core.js
Committed r3879
        M       popserver/popserver/controllers/api/items.py
        M       popserver/popserver/public/popui/popui-core.js
        M       popserver/popserver/public/popui/comment-panel/comment-panel.mako
r3879 = 4595b28e3b6c36b6cab759122fdb63e081c96ded (trunk)
No changes between current HEAD and refs/remotes/trunk
Resetting to the latest refs/remotes/trunk
k@k0002:~/popego_gitted$ git status
# On branch master
nothing to commit (working directory clean)