I've been doing some trivial pom patches, along with the one line HDFS-5075
patch

branch-2 $ svn status
M       hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
M
hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
 branch-2 $ svn commit -m "HDFS-5075 httpfs-config.sh calls out incorrect
env script name"
Sending        hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Sending
 hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/libexec/httpfs-config.sh
Transmitting file data ..
Committed revision 1541687.


then I go to pull it up into trunk -an action which worked a few minutes
earlier for POM patch MAPREDUCE-5431

  hadoop-trunk $ svn merge -r 1541686:1541687
https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2 .

svn: E160006: No such revision 1541687 branch-2 $ svn update
The commit I just put up isn't there

So I go back to the branch-2 directory
 branch-2 $ svn update
Updating '.':
svn: E160006: No such reported revision '1541687' found in the repository.
 Perhaps the repository is out of date with respect to the master
repository?
 branch-2 $ svn info
Path: .
Working Copy Root Path: /Users/stevel/Hadoop/svn/branch-2
URL: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2
Repository Root: https://svn.apache.org/repos/asf
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 1541675
Node Kind: directory
Schedule: normal
Last Changed Author: jing9
Last Changed Rev: 1541671
Last Changed Date: 2013-11-13 19:34:08 +0000 (Wed, 13 Nov 2013)

 branch-2 $

Anyway: after about 5 minutes everything resynchronized again, but it looks
like svn is exposing its failover mechanisms

-steve

-- 
CONFIDENTIALITY NOTICE
NOTICE: This message is intended for the use of the individual or entity to 
which it is addressed and may contain information that is confidential, 
privileged and exempt from disclosure under applicable law. If the reader 
of this message is not the intended recipient, you are hereby notified that 
any printing, copying, dissemination, distribution, disclosure or 
forwarding of this communication is strictly prohibited. If you have 
received this communication in error, please contact the sender immediately 
and delete it from your system. Thank You.

Reply via email to