[Monotone-devel] Unresolved conflict, want to back out...

[J Decker]

Here is a batch file which accomplishes the same thing I did.

It creates a temp .db using mtn 
it generates a key called 'junk' which it sets up for itself.

It starts by deleting the temp directory 'x' and the database '
temp.db' then starts fresh every time.

---- Begin test.bat ----

rmdir /s x
del temp.db
mtn --db=temp.db db init
mtn --db=temp.db genkey junk
mkdir x
mtn --db=temp.db --key=junk --branch=branch.a
 setup x
cd x
echo "Branch A" >file
mtn add file
mtn commit -m "Initial commit branch A" 
mkdir path
cd path
echo "branch a path1" >file2
mtn add file2
mtn commit -m "Initial commit branch B" --branch=
branch.b
cd ..
mtn update -r h:branch.a
mtn head
mkdir path2
cd path2
echo "branch C path 2 file 1" >file3
mtn add file3
mtn commit -m "Initial commit branch C" --branch=branch.c
mtn propagate branch.b branch.c
cd ..
mtn update -r h:branch.a
echo "New Branch A" >>file
mtn commit -m "Updated branch A, begin propagate." 

mtn propagate branch.a branch.b
mtn propagate branch.b branch.c

mtn pluck -r h:branch.a -r h:branch.b

mtn commit

mtn propagate branch.a branch.c
echo --- The above line failed.--- 
goto done.
mtn propagate branch.b branch.c



:done
----- Done Test.bat ----