Changeset 1846 for branches/locker-dev/lvs

Timestamp:

May 3, 2011, 1:42:08 AM (13 years ago)

Author:

adehnert

Message:

Record changes that have been merged to trunk

See http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice
for the reason behind doing this.

In particular, this is the result of:
svn merge --record-only -c 1750 ^/trunk/locker/sbin/
cd ../..
svn merge --record-only -c 1791 ^/trunk/
svn merge --record-only -c 1551 ^/trunk/
(picked based on which changes caused tree conflicts during the merge of
trunk back onto this branch, and then seeing which commits were already
made)

File:

• branches/locker-dev (modified) (1 prop)