[svk-devel] smerge on mirror

Marcin Konarski marcin.konarski at gmail.com
Tue Aug 28 16:18:36 EDT 2007


Hello list.

Somehow I am unable to perform smerge on branches via mirror.
Is that kind of operation supported at all?
I am attaching, in this very email, a short script that triggers
unwanted behavior.
Just create empty directory, descend into it and run this script.
Warning: this script detaches "/a/" and "/b/" depots.

Thank you for your attention.

Best regards.

# ------ script starts here -------

#! /bin/sh

invoke() {
	echo "${@}" >&2
	"${@}"
}

ROOT=`pwd`

invoke /bin/rm -rf a b c
invoke svk depotmap --detach a
invoke svk depotmap --detach b

if [ "x${1}" = "xc" ] ; then
	exit 0
fi

invoke svnadmin create a
invoke svnadmin create b
invoke svk depotmap a ${ROOT}/a
invoke svk depotmap b ${ROOT}/b
invoke svk mirror file://${ROOT}/a/ /b/
invoke svk sync /b/
invoke mkdir c
invoke echo "base" > c/base.txt
invoke svk import -m "one and only module" c /a/c/trunk
invoke svk mkdir -m "branches" /a/c/branches
invoke svk cp -m "developer1" /a/c/trunk /a/c/branches/d1
invoke svk sync /b/
invoke svk sm /a/c/trunk /a/c/branches/d1 # work ok
invoke svk sm /b/c/trunk /b/c/branches/d1 # fails badly

# ------ script ends here -------

-- 
  Huginn
GCS d? s:+>: a- C++$() UB++++$ P++ L++++$ E---
W+(-) N++ o? K? w-- O M- V- PS+ PE++ Y PGP-
t--- 5-- X- R !tv b++ DI++ D+ G e* h+


More information about the svk-devel mailing list