hgbook
changeset 333:04c08ad7e92e
Translated svgs dummy .tex towards building
line diff
1.1 --- a/es/Leame.1st Sat Oct 18 06:02:21 2008 -0500 1.2 +++ b/es/Leame.1st Sat Oct 18 07:48:21 2008 -0500 1.3 @@ -27,17 +27,24 @@ 1.4 1.5 Branch: Rama 1.6 Bug: Fallo 1.7 + Changelog: Bitácora de Cambios 1.8 Changeset: Conjunto de Cambios 1.9 Command: Orden 1.10 Commit: Consignar 1.11 + Head: Principal 1.12 Merge: Fusión 1.13 Milestone: Etapa 1.14 + Patch: Parche 1.15 + Push: Publicar 1.16 Release: Versión o liberación de versión 1.17 + Revlog: Bitácora de revisiones 1.18 + Snapshot: ¿? Traducir dentro de snapshot.svg revlog.svg 1.19 1.20 = Para compilar = 1.21 Todavía no hemos logrado, pero he aquí algunas dependencias : 1.22 1.23 -apt-get install texlive-latex-extra tex4ht 1.24 +apt-get install texlive-latex-extra tex4ht diffstat patchutils \ 1.25 + inkscape graphviz texlive-pdfetex 1.26 1.27 = Traductores = 1.28 Por favor mantenga esta lista en orden alfabético
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/es/bookhtml.cfg Sat Oct 18 07:48:21 2008 -0500 2.3 @@ -0,0 +1,1 @@ 2.4 +../en/bookhtml.cfg 2.5 \ No newline at end of file
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/es/cmdref.py Sat Oct 18 07:48:21 2008 -0500 3.3 @@ -0,0 +1,1 @@ 3.4 +../en/cmdref.py 3.5 \ No newline at end of file
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 4.2 +++ b/es/examples/backout Sat Oct 18 07:48:21 2008 -0500 4.3 @@ -0,0 +1,83 @@ 4.4 +#!/bin/bash 4.5 + 4.6 +# We have to fake the merges here, because they cause conflicts with 4.7 +# three-way command-line merge, and kdiff3 may not be available. 4.8 + 4.9 +export HGMERGE=$(mktemp) 4.10 +echo '#!/bin/sh' >> $HGMERGE 4.11 +echo 'echo first change > "$1"' >> $HGMERGE 4.12 +echo 'echo third change >> "$1"' >> $HGMERGE 4.13 +chmod 700 $HGMERGE 4.14 + 4.15 +#$ name: init 4.16 + 4.17 +hg init myrepo 4.18 +cd myrepo 4.19 +echo first change >> myfile 4.20 +hg add myfile 4.21 +hg commit -m 'first change' 4.22 +echo second change >> myfile 4.23 +hg commit -m 'second change' 4.24 + 4.25 +#$ name: simple 4.26 + 4.27 +hg backout -m 'back out second change' tip 4.28 +cat myfile 4.29 + 4.30 +#$ name: simple.log 4.31 +#$ ignore: \s+200[78]-.* 4.32 + 4.33 +hg log --style compact 4.34 + 4.35 +#$ name: non-tip.clone 4.36 + 4.37 +cd .. 4.38 +hg clone -r1 myrepo non-tip-repo 4.39 +cd non-tip-repo 4.40 + 4.41 +#$ name: non-tip.backout 4.42 + 4.43 +echo third change >> myfile 4.44 +hg commit -m 'third change' 4.45 +hg backout --merge -m 'back out second change' 1 4.46 + 4.47 +#$ name: non-tip.cat 4.48 +cat myfile 4.49 + 4.50 +#$ name: manual.clone 4.51 + 4.52 +cd .. 4.53 +hg clone -r1 myrepo newrepo 4.54 +cd newrepo 4.55 + 4.56 +#$ name: manual.backout 4.57 + 4.58 +echo third change >> myfile 4.59 +hg commit -m 'third change' 4.60 +hg backout -m 'back out second change' 1 4.61 + 4.62 +#$ name: manual.log 4.63 + 4.64 +hg log --style compact 4.65 + 4.66 +#$ name: manual.parents 4.67 + 4.68 +hg parents 4.69 + 4.70 +#$ name: manual.heads 4.71 + 4.72 +hg heads 4.73 + 4.74 +#$ name: manual.cat 4.75 + 4.76 +cat myfile 4.77 + 4.78 +#$ name: manual.merge 4.79 + 4.80 +hg merge 4.81 +hg commit -m 'merged backout with previous tip' 4.82 +cat myfile 4.83 + 4.84 +#$ name: 4.85 + 4.86 +rm $HGMERGE
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/es/examples/bisect Sat Oct 18 07:48:21 2008 -0500 5.3 @@ -0,0 +1,96 @@ 5.4 +#!/bin/bash 5.5 + 5.6 +if hg -v | head -1 | grep -e "version 0.*" 5.7 +then 5.8 +#On mercurial 1.0 and later bisect is a builtin 5.9 +echo '[extensions]' >> $HGRC 5.10 +echo 'hbisect =' >> $HGRC 5.11 +fi 5.12 + 5.13 +# XXX There's some kind of horrible nondeterminism in the execution of 5.14 +# bisect at the moment. Ugh. 5.15 + 5.16 +#$ ignore: .* 5.17 + 5.18 +#$ name: init 5.19 + 5.20 +hg init mybug 5.21 +cd mybug 5.22 + 5.23 +#$ name: commits 5.24 + 5.25 +buggy_change=22 5.26 + 5.27 +for (( i = 0; i < 35; i++ )); do 5.28 + if [[ $i = $buggy_change ]]; then 5.29 + echo 'i have a gub' > myfile$i 5.30 + hg commit -q -A -m 'buggy changeset' 5.31 + else 5.32 + echo 'nothing to see here, move along' > myfile$i 5.33 + hg commit -q -A -m 'normal changeset' 5.34 + fi 5.35 +done 5.36 + 5.37 +#$ name: help 5.38 + 5.39 +hg help bisect 5.40 + 5.41 +#$ name: search.init 5.42 + 5.43 +if hg -v | head -1 | grep -e "version 0.*" 5.44 +then 5.45 +#On mercurial 1.0 --init disappeared 5.46 +hg bisect --init 5.47 +fi 5.48 + 5.49 +#$ name: search.bad-init 5.50 + 5.51 +hg bisect --bad 5.52 + 5.53 +#$ name: search.good-init 5.54 + 5.55 +hg bisect --good 10 5.56 + 5.57 +#$ name: search.step1 5.58 + 5.59 +if grep -q 'i have a gub' * 5.60 +then 5.61 + result=bad 5.62 +else 5.63 + result=good 5.64 +fi 5.65 + 5.66 +echo this revision is $result 5.67 +hg bisect --$result 5.68 + 5.69 +#$ name: search.mytest 5.70 + 5.71 +mytest() { 5.72 + if grep -q 'i have a gub' * 5.73 + then 5.74 + result=bad 5.75 + else 5.76 + result=good 5.77 + fi 5.78 + 5.79 + echo this revision is $result 5.80 + hg bisect --$result 5.81 +} 5.82 + 5.83 +#$ name: search.step2 5.84 + 5.85 +mytest 5.86 + 5.87 +#$ name: search.rest 5.88 + 5.89 +mytest 5.90 +mytest 5.91 +mytest 5.92 + 5.93 +#$ name: search.reset 5.94 + 5.95 +hg bisect --reset 5.96 + 5.97 +#$ name: 5.98 + 5.99 +exit 0
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/es/examples/branch-named Sat Oct 18 07:48:21 2008 -0500 6.3 @@ -0,0 +1,73 @@ 6.4 +#!/bin/bash 6.5 + 6.6 +hg init a 6.7 +cd a 6.8 +echo hello > myfile 6.9 +hg commit -A -m 'Initial commit' 6.10 + 6.11 +#$ name: branches 6.12 + 6.13 +hg tip 6.14 +hg branches 6.15 + 6.16 +#$ name: branch 6.17 + 6.18 +hg branch 6.19 + 6.20 +#$ name: create 6.21 + 6.22 +hg branch foo 6.23 +hg branch 6.24 + 6.25 +#$ name: status 6.26 + 6.27 +hg status 6.28 +hg tip 6.29 + 6.30 +#$ name: commit 6.31 + 6.32 +echo 'hello again' >> myfile 6.33 +hg commit -m 'Second commit' 6.34 +hg tip 6.35 + 6.36 +#$ name: rebranch 6.37 + 6.38 +hg branch 6.39 +hg branch bar 6.40 +echo new file > newfile 6.41 +hg commit -A -m 'Third commit' 6.42 +hg tip 6.43 + 6.44 +#$ name: parents 6.45 + 6.46 +hg parents 6.47 +hg branches 6.48 + 6.49 +#$ name: update-switchy 6.50 + 6.51 +hg update foo 6.52 +hg parents 6.53 +hg update bar 6.54 +hg parents 6.55 + 6.56 +#$ name: update-nothing 6.57 + 6.58 +hg update foo 6.59 +hg update 6.60 + 6.61 +#$ name: foo-commit 6.62 + 6.63 +echo something > somefile 6.64 +hg commit -A -m 'New file' 6.65 +hg heads 6.66 + 6.67 +#$ name: update-bar 6.68 + 6.69 +hg update bar 6.70 + 6.71 +#$ name: merge 6.72 + 6.73 +hg branch 6.74 +hg merge foo 6.75 +hg commit -m 'Merge' 6.76 +hg tip
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/es/examples/branch-repo Sat Oct 18 07:48:21 2008 -0500 7.3 @@ -0,0 +1,48 @@ 7.4 +#!/bin/bash 7.5 + 7.6 +hg init myproject 7.7 +cd myproject 7.8 +echo hello > myfile 7.9 +hg commit -A -m 'Initial commit' 7.10 +cd .. 7.11 + 7.12 +#$ name: tag 7.13 + 7.14 +cd myproject 7.15 +hg tag v1.0 7.16 + 7.17 +#$ name: clone 7.18 + 7.19 +cd .. 7.20 +hg clone myproject myproject-1.0.1 7.21 + 7.22 +#$ name: bugfix 7.23 + 7.24 +hg clone myproject-1.0.1 my-1.0.1-bugfix 7.25 +cd my-1.0.1-bugfix 7.26 +echo 'I fixed a bug using only echo!' >> myfile 7.27 +hg commit -m 'Important fix for 1.0.1' 7.28 +#$ ignore: /tmp/branch-repo.* 7.29 +hg push 7.30 + 7.31 +#$ name: new 7.32 + 7.33 +cd .. 7.34 +hg clone myproject my-feature 7.35 +cd my-feature 7.36 +echo 'This sure is an exciting new feature!' > mynewfile 7.37 +hg commit -A -m 'New feature' 7.38 +hg push 7.39 + 7.40 +#$ name: pull 7.41 + 7.42 +cd .. 7.43 +hg clone myproject myproject-merge 7.44 +cd myproject-merge 7.45 +hg pull ../myproject-1.0.1 7.46 + 7.47 +#$ name: merge 7.48 + 7.49 +hg merge 7.50 +hg commit -m 'Merge bugfix from 1.0.1 branch' 7.51 +hg push
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/es/examples/branching Sat Oct 18 07:48:21 2008 -0500 8.3 @@ -0,0 +1,63 @@ 8.4 +#!/bin/bash 8.5 + 8.6 +#$ name: init 8.7 + 8.8 +hg init main 8.9 +cd main 8.10 +echo 'This is a boring feature.' > myfile 8.11 +hg commit -A -m 'We have reached an important milestone!' 8.12 + 8.13 +#$ name: tag 8.14 + 8.15 +hg tag v1.0 8.16 +hg tip 8.17 +hg tags 8.18 + 8.19 +#$ name: main 8.20 + 8.21 +cd ../main 8.22 +echo 'This is exciting and new!' >> myfile 8.23 +hg commit -m 'Add a new feature' 8.24 +cat myfile 8.25 + 8.26 +#$ name: update 8.27 + 8.28 +cd .. 8.29 +hg clone -U main main-old 8.30 +cd main-old 8.31 +hg update v1.0 8.32 +cat myfile 8.33 + 8.34 +#$ name: clone 8.35 + 8.36 +cd .. 8.37 +hg clone -rv1.0 main stable 8.38 + 8.39 +#$ name: stable 8.40 + 8.41 +hg clone stable stable-fix 8.42 +cd stable-fix 8.43 +echo 'This is a fix to a boring feature.' > myfile 8.44 +hg commit -m 'Fix a bug' 8.45 +#$ ignore: /tmp/branching.* 8.46 +hg push 8.47 + 8.48 +#$ name: 8.49 + 8.50 +export HGMERGE=$(mktemp) 8.51 +echo '#!/bin/sh' > $HGMERGE 8.52 +echo 'echo "This is a fix to a boring feature." > "$1"' >> $HGMERGE 8.53 +echo 'echo "This is exciting and new!" >> "$1"' >> $HGMERGE 8.54 +chmod 700 $HGMERGE 8.55 + 8.56 +#$ name: merge 8.57 + 8.58 +cd ../main 8.59 +hg pull ../stable 8.60 +hg merge 8.61 +hg commit -m 'Bring in bugfix from stable branch' 8.62 +cat myfile 8.63 + 8.64 +#$ name: 8.65 + 8.66 +rm $HGMERGE
9.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 9.2 +++ b/es/examples/cmdref Sat Oct 18 07:48:21 2008 -0500 9.3 @@ -0,0 +1,22 @@ 9.4 +#!/bin/bash 9.5 + 9.6 +hg init diff 9.7 +cd diff 9.8 +cat > myfile.c <<EOF 9.9 +int myfunc() 9.10 +{ 9.11 + return 1; 9.12 +} 9.13 +EOF 9.14 +hg ci -Ama 9.15 + 9.16 +sed -ie 's/return 1/return 10/' myfile.c 9.17 + 9.18 +#$ name: diff-p 9.19 + 9.20 +echo '[diff]' >> $HGRC 9.21 +echo 'showfunc = False' >> $HGRC 9.22 + 9.23 +hg diff 9.24 + 9.25 +hg diff -p
10.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 10.2 +++ b/es/examples/daily.copy Sat Oct 18 07:48:21 2008 -0500 10.3 @@ -0,0 +1,82 @@ 10.4 +#!/bin/bash 10.5 + 10.6 +#$ name: init 10.7 + 10.8 +hg init my-copy 10.9 +cd my-copy 10.10 +echo line > file 10.11 +hg add file 10.12 +hg commit -m 'Added a file' 10.13 + 10.14 +#$ name: clone 10.15 + 10.16 +cd .. 10.17 +hg clone my-copy your-copy 10.18 + 10.19 +#$ name: copy 10.20 + 10.21 +cd my-copy 10.22 +hg copy file new-file 10.23 + 10.24 +#$ name: status 10.25 + 10.26 +hg status 10.27 + 10.28 +#$ name: status-copy 10.29 + 10.30 +hg status -C 10.31 +hg commit -m 'Copied file' 10.32 + 10.33 +#$ name: other 10.34 + 10.35 +cd ../your-copy 10.36 +echo 'new contents' >> file 10.37 +hg commit -m 'Changed file' 10.38 + 10.39 +#$ name: cat 10.40 + 10.41 +cat file 10.42 +cat ../my-copy/new-file 10.43 + 10.44 +#$ name: merge 10.45 + 10.46 +hg pull ../my-copy 10.47 +hg merge 10.48 +cat new-file 10.49 + 10.50 +#$ name: 10.51 + 10.52 +cd .. 10.53 +hg init copy-example 10.54 +cd copy-example 10.55 +echo a > a 10.56 +echo b > b 10.57 +mkdir c 10.58 +mkdir c/a 10.59 +echo c > c/a/c 10.60 +hg ci -Ama 10.61 + 10.62 +#$ name: simple 10.63 + 10.64 +mkdir k 10.65 +hg copy a k 10.66 +ls k 10.67 + 10.68 +#$ name: dir-dest 10.69 + 10.70 +mkdir d 10.71 +hg copy a b d 10.72 +ls d 10.73 + 10.74 +#$ name: dir-src 10.75 + 10.76 +hg copy c e 10.77 + 10.78 +#$ name: dir-src-dest 10.79 + 10.80 +hg copy c d 10.81 + 10.82 +#$ name: after 10.83 + 10.84 +cp a z 10.85 +hg copy --after a z
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/es/examples/daily.files Sat Oct 18 07:48:21 2008 -0500 11.3 @@ -0,0 +1,93 @@ 11.4 +#!/bin/bash 11.5 + 11.6 +#$ name: add 11.7 + 11.8 +hg init add-example 11.9 +cd add-example 11.10 +echo a > a 11.11 +hg status 11.12 +hg add a 11.13 +hg status 11.14 +hg commit -m 'Added one file' 11.15 +hg status 11.16 + 11.17 +#$ name: add-dir 11.18 + 11.19 +mkdir b 11.20 +echo b > b/b 11.21 +echo c > b/c 11.22 +mkdir b/d 11.23 +echo d > b/d/d 11.24 +hg add b 11.25 +hg commit -m 'Added all files in subdirectory' 11.26 + 11.27 +#$ name: 11.28 + 11.29 +cd .. 11.30 + 11.31 +#$ name: hidden 11.32 + 11.33 +hg init hidden-example 11.34 +cd hidden-example 11.35 +mkdir empty 11.36 +touch empty/.hidden 11.37 +hg add empty/.hidden 11.38 +hg commit -m 'Manage an empty-looking directory' 11.39 +ls empty 11.40 +cd .. 11.41 +hg clone hidden-example tmp 11.42 +ls tmp 11.43 +ls tmp/empty 11.44 + 11.45 +#$ name: remove 11.46 + 11.47 +hg init remove-example 11.48 +cd remove-example 11.49 +echo a > a 11.50 +mkdir b 11.51 +echo b > b/b 11.52 +hg add a b 11.53 +hg commit -m 'Small example for file removal' 11.54 +hg remove a 11.55 +hg status 11.56 +hg remove b 11.57 + 11.58 +#$ name: 11.59 + 11.60 +cd .. 11.61 + 11.62 +#$ name: missing 11.63 +hg init missing-example 11.64 +cd missing-example 11.65 +echo a > a 11.66 +hg add a 11.67 +hg commit -m 'File about to be missing' 11.68 +rm a 11.69 +hg status 11.70 + 11.71 +#$ name: remove-after 11.72 + 11.73 +hg remove --after a 11.74 +hg status 11.75 + 11.76 +#$ name: recover-missing 11.77 +hg revert a 11.78 +cat a 11.79 +hg status 11.80 + 11.81 +#$ name: 11.82 + 11.83 +cd .. 11.84 + 11.85 +#$ name: addremove 11.86 + 11.87 +hg init addremove-example 11.88 +cd addremove-example 11.89 +echo a > a 11.90 +echo b > b 11.91 +hg addremove 11.92 + 11.93 +#$ name: commit-addremove 11.94 + 11.95 +echo c > c 11.96 +hg commit -A -m 'Commit with addremove'
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/es/examples/daily.rename Sat Oct 18 07:48:21 2008 -0500 12.3 @@ -0,0 +1,18 @@ 12.4 +#!/bin/bash 12.5 + 12.6 +hg init a 12.7 +cd a 12.8 +echo a > a 12.9 +hg ci -Ama 12.10 + 12.11 +#$ name: rename 12.12 + 12.13 +hg rename a b 12.14 + 12.15 +#$ name: status 12.16 + 12.17 +hg status 12.18 + 12.19 +#$ name: status-copy 12.20 + 12.21 +hg status -C
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/es/examples/daily.revert Sat Oct 18 07:48:21 2008 -0500 13.3 @@ -0,0 +1,74 @@ 13.4 +#!/bin/bash 13.5 + 13.6 +hg init a 13.7 +cd a 13.8 +echo 'original content' > file 13.9 +hg ci -Ama 13.10 + 13.11 +#$ name: modify 13.12 + 13.13 +cat file 13.14 +echo unwanted change >> file 13.15 +hg diff file 13.16 + 13.17 +#$ name: unmodify 13.18 + 13.19 +hg status 13.20 +hg revert file 13.21 +cat file 13.22 + 13.23 +#$ name: status 13.24 + 13.25 +hg status 13.26 +cat file.orig 13.27 + 13.28 +#$ name: 13.29 + 13.30 +rm file.orig 13.31 + 13.32 +#$ name: add 13.33 + 13.34 +echo oops > oops 13.35 +hg add oops 13.36 +hg status oops 13.37 +hg revert oops 13.38 +hg status 13.39 + 13.40 +#$ name: 13.41 + 13.42 +rm oops 13.43 + 13.44 +#$ name: remove 13.45 + 13.46 +hg remove file 13.47 +hg status 13.48 +hg revert file 13.49 +hg status 13.50 +ls file 13.51 + 13.52 +#$ name: missing 13.53 + 13.54 +rm file 13.55 +hg status 13.56 +hg revert file 13.57 +ls file 13.58 + 13.59 +#$ name: copy 13.60 + 13.61 +hg copy file new-file 13.62 +hg revert new-file 13.63 +hg status 13.64 + 13.65 +#$ name: 13.66 + 13.67 +rm new-file 13.68 + 13.69 +#$ name: rename 13.70 + 13.71 +hg rename file new-file 13.72 +hg revert new-file 13.73 +hg status 13.74 + 13.75 +#$ name: rename-orig 13.76 +hg revert file 13.77 +hg status
14.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 14.2 +++ b/es/examples/data/check_whitespace.py Sat Oct 18 07:48:21 2008 -0500 14.3 @@ -0,0 +1,44 @@ 14.4 +#!/usr/bin/python 14.5 + 14.6 +import re 14.7 + 14.8 +def trailing_whitespace(difflines): 14.9 + added, linenum, header = [], 0, False 14.10 + 14.11 + for line in difflines: 14.12 + if header: 14.13 + # remember the name of the file that this diff affects 14.14 + m = re.match(r'(?:---|\+\+\+) ([^\t]+)', line) 14.15 + if m and m.group(1) != '/dev/null': 14.16 + filename = m.group(1).split('/', 1)[-1] 14.17 + if line.startswith('+++ '): 14.18 + header = False 14.19 + continue 14.20 + if line.startswith('diff '): 14.21 + header = True 14.22 + continue 14.23 + # hunk header - save the line number 14.24 + m = re.match(r'@@ -\d+,\d+ \+(\d+),', line) 14.25 + if m: 14.26 + linenum = int(m.group(1)) 14.27 + continue 14.28 + # hunk body - check for an added line with trailing whitespace 14.29 + m = re.match(r'\+.*\s$', line) 14.30 + if m: 14.31 + added.append((filename, linenum)) 14.32 + if line and line[0] in ' +': 14.33 + linenum += 1 14.34 + return added 14.35 + 14.36 +if __name__ == '__main__': 14.37 + import os, sys 14.38 + 14.39 + added = trailing_whitespace(os.popen('hg export tip')) 14.40 + if added: 14.41 + for filename, linenum in added: 14.42 + print >> sys.stderr, ('%s, line %d: trailing whitespace added' % 14.43 + (filename, linenum)) 14.44 + # save the commit message so we don't need to retype it 14.45 + os.system('hg tip --template "{desc}" > .hg/commit.save') 14.46 + print >> sys.stderr, 'commit message saved to .hg/commit.save' 14.47 + sys.exit(1)
15.1 Binary file es/examples/data/netplug-1.2.5.tar.bz2 has changed
16.1 Binary file es/examples/data/netplug-1.2.8.tar.bz2 has changed
17.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 17.2 +++ b/es/examples/data/remove-redundant-null-checks.patch Sat Oct 18 07:48:21 2008 -0500 17.3 @@ -0,0 +1,190 @@ 17.4 + 17.5 +From: Jesper Juhl <jesper.juhl@gmail.com> 17.6 + 17.7 +Remove redundant NULL chck before kfree + tiny CodingStyle cleanup for 17.8 +drivers/ 17.9 + 17.10 +Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> 17.11 +Signed-off-by: Andrew Morton <akpm@osdl.org> 17.12 +--- 17.13 + 17.14 + drivers/char/agp/sgi-agp.c | 5 ++--- 17.15 + drivers/char/hvcs.c | 11 +++++------ 17.16 + drivers/message/fusion/mptfc.c | 6 ++---- 17.17 + drivers/message/fusion/mptsas.c | 3 +-- 17.18 + drivers/net/fs_enet/fs_enet-mii.c | 3 +-- 17.19 + drivers/net/wireless/ipw2200.c | 22 ++++++---------------- 17.20 + drivers/scsi/libata-scsi.c | 4 +--- 17.21 + drivers/video/au1100fb.c | 3 +-- 17.22 + 8 files changed, 19 insertions(+), 38 deletions(-) 17.23 + 17.24 +diff -puN drivers/char/agp/sgi-agp.c~remove-redundant-null-checks-before-free-in-drivers drivers/char/agp/sgi-agp.c 17.25 +--- a/drivers/char/agp/sgi-agp.c~remove-redundant-null-checks-before-free-in-drivers 17.26 ++++ a/drivers/char/agp/sgi-agp.c 17.27 +@@ -329,9 +329,8 @@ static int __devinit agp_sgi_init(void) 17.28 + 17.29 + static void __devexit agp_sgi_cleanup(void) 17.30 + { 17.31 +- if (sgi_tioca_agp_bridges) 17.32 +- kfree(sgi_tioca_agp_bridges); 17.33 +- sgi_tioca_agp_bridges=NULL; 17.34 ++ kfree(sgi_tioca_agp_bridges); 17.35 ++ sgi_tioca_agp_bridges = NULL; 17.36 + } 17.37 + 17.38 + module_init(agp_sgi_init); 17.39 +diff -puN drivers/char/hvcs.c~remove-redundant-null-checks-before-free-in-drivers drivers/char/hvcs.c 17.40 +--- a/drivers/char/hvcs.c~remove-redundant-null-checks-before-free-in-drivers 17.41 ++++ a/drivers/char/hvcs.c 17.42 +@@ -1320,11 +1320,12 @@ static struct tty_operations hvcs_ops = 17.43 + static int hvcs_alloc_index_list(int n) 17.44 + { 17.45 + int i; 17.46 ++ 17.47 + hvcs_index_list = kmalloc(n * sizeof(hvcs_index_count),GFP_KERNEL); 17.48 + if (!hvcs_index_list) 17.49 + return -ENOMEM; 17.50 + hvcs_index_count = n; 17.51 +- for(i = 0; i < hvcs_index_count; i++) 17.52 ++ for (i = 0; i < hvcs_index_count; i++) 17.53 + hvcs_index_list[i] = -1; 17.54 + return 0; 17.55 + } 17.56 +@@ -1332,11 +1333,9 @@ static int hvcs_alloc_index_list(int n) 17.57 + static void hvcs_free_index_list(void) 17.58 + { 17.59 + /* Paranoia check to be thorough. */ 17.60 +- if (hvcs_index_list) { 17.61 +- kfree(hvcs_index_list); 17.62 +- hvcs_index_list = NULL; 17.63 +- hvcs_index_count = 0; 17.64 +- } 17.65 ++ kfree(hvcs_index_list); 17.66 ++ hvcs_index_list = NULL; 17.67 ++ hvcs_index_count = 0; 17.68 + } 17.69 + 17.70 + static int __init hvcs_module_init(void) 17.71 +diff -puN drivers/message/fusion/mptfc.c~remove-redundant-null-checks-before-free-in-drivers drivers/message/fusion/mptfc.c 17.72 +--- a/drivers/message/fusion/mptfc.c~remove-redundant-null-checks-before-free-in-drivers 17.73 ++++ a/drivers/message/fusion/mptfc.c 17.74 +@@ -305,10 +305,8 @@ mptfc_GetFcDevPage0(MPT_ADAPTER *ioc, in 17.75 + } 17.76 + 17.77 + out: 17.78 +- if (pp0_array) 17.79 +- kfree(pp0_array); 17.80 +- if (p0_array) 17.81 +- kfree(p0_array); 17.82 ++ kfree(pp0_array); 17.83 ++ kfree(p0_array); 17.84 + return rc; 17.85 + } 17.86 + 17.87 +diff -puN drivers/message/fusion/mptsas.c~remove-redundant-null-checks-before-free-in-drivers drivers/message/fusion/mptsas.c 17.88 +--- a/drivers/message/fusion/mptsas.c~remove-redundant-null-checks-before-free-in-drivers 17.89 ++++ a/drivers/message/fusion/mptsas.c 17.90 +@@ -1378,8 +1378,7 @@ mptsas_probe_hba_phys(MPT_ADAPTER *ioc) 17.91 + return 0; 17.92 + 17.93 + out_free_port_info: 17.94 +- if (hba) 17.95 +- kfree(hba); 17.96 ++ kfree(hba); 17.97 + out: 17.98 + return error; 17.99 + } 17.100 +diff -puN drivers/net/fs_enet/fs_enet-mii.c~remove-redundant-null-checks-before-free-in-drivers drivers/net/fs_enet/fs_enet-mii.c 17.101 +--- a/drivers/net/fs_enet/fs_enet-mii.c~remove-redundant-null-checks-before-free-in-drivers 17.102 ++++ a/drivers/net/fs_enet/fs_enet-mii.c 17.103 +@@ -431,8 +431,7 @@ static struct fs_enet_mii_bus *create_bu 17.104 + return bus; 17.105 + 17.106 + err: 17.107 +- if (bus) 17.108 +- kfree(bus); 17.109 ++ kfree(bus); 17.110 + return ERR_PTR(ret); 17.111 + } 17.112 + 17.113 +diff -puN drivers/net/wireless/ipw2200.c~remove-redundant-null-checks-before-free-in-drivers drivers/net/wireless/ipw2200.c 17.114 +--- a/drivers/net/wireless/ipw2200.c~remove-redundant-null-checks-before-free-in-drivers 17.115 ++++ a/drivers/net/wireless/ipw2200.c 17.116 +@@ -1229,12 +1229,6 @@ static struct ipw_fw_error *ipw_alloc_er 17.117 + return error; 17.118 + } 17.119 + 17.120 +-static void ipw_free_error_log(struct ipw_fw_error *error) 17.121 +-{ 17.122 +- if (error) 17.123 +- kfree(error); 17.124 +-} 17.125 +- 17.126 + static ssize_t show_event_log(struct device *d, 17.127 + struct device_attribute *attr, char *buf) 17.128 + { 17.129 +@@ -1296,10 +1290,9 @@ static ssize_t clear_error(struct device 17.130 + const char *buf, size_t count) 17.131 + { 17.132 + struct ipw_priv *priv = dev_get_drvdata(d); 17.133 +- if (priv->error) { 17.134 +- ipw_free_error_log(priv->error); 17.135 +- priv->error = NULL; 17.136 +- } 17.137 ++ 17.138 ++ kfree(priv->error); 17.139 ++ priv->error = NULL; 17.140 + return count; 17.141 + } 17.142 + 17.143 +@@ -1970,8 +1963,7 @@ static void ipw_irq_tasklet(struct ipw_p 17.144 + struct ipw_fw_error *error = 17.145 + ipw_alloc_error_log(priv); 17.146 + ipw_dump_error_log(priv, error); 17.147 +- if (error) 17.148 +- ipw_free_error_log(error); 17.149 ++ kfree(error); 17.150 + } 17.151 + #endif 17.152 + } else { 17.153 +@@ -11693,10 +11685,8 @@ static void ipw_pci_remove(struct pci_de 17.154 + } 17.155 + } 17.156 + 17.157 +- if (priv->error) { 17.158 +- ipw_free_error_log(priv->error); 17.159 +- priv->error = NULL; 17.160 +- } 17.161 ++ kfree(priv->error); 17.162 ++ priv->error = NULL; 17.163 + 17.164 + #ifdef CONFIG_IPW2200_PROMISCUOUS 17.165 + ipw_prom_free(priv); 17.166 +diff -puN drivers/scsi/libata-scsi.c~remove-redundant-null-checks-before-free-in-drivers drivers/scsi/libata-scsi.c 17.167 +--- a/drivers/scsi/libata-scsi.c~remove-redundant-null-checks-before-free-in-drivers 17.168 ++++ a/drivers/scsi/libata-scsi.c 17.169 +@@ -222,9 +222,7 @@ int ata_cmd_ioctl(struct scsi_device *sc 17.170 + && copy_to_user(arg + sizeof(args), argbuf, argsize)) 17.171 + rc = -EFAULT; 17.172 + error: 17.173 +- if (argbuf) 17.174 +- kfree(argbuf); 17.175 +- 17.176 ++ kfree(argbuf); 17.177 + return rc; 17.178 + } 17.179 + 17.180 +diff -puN drivers/video/au1100fb.c~remove-redundant-null-checks-before-free-in-drivers drivers/video/au1100fb.c 17.181 +--- a/drivers/video/au1100fb.c~remove-redundant-null-checks-before-free-in-drivers 17.182 ++++ a/drivers/video/au1100fb.c 17.183 +@@ -743,8 +743,7 @@ void __exit au1100fb_cleanup(void) 17.184 + { 17.185 + driver_unregister(&au1100fb_driver); 17.186 + 17.187 +- if (drv_info.opt_mode) 17.188 +- kfree(drv_info.opt_mode); 17.189 ++ kfree(drv_info.opt_mode); 17.190 + } 17.191 + 17.192 + module_init(au1100fb_init); 17.193 +_
18.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 18.2 +++ b/es/examples/extdiff Sat Oct 18 07:48:21 2008 -0500 18.3 @@ -0,0 +1,28 @@ 18.4 +#!/bin/bash 18.5 + 18.6 +echo '[extensions]' >> $HGRC 18.7 +echo 'extdiff =' >> $HGRC 18.8 + 18.9 +hg init a 18.10 +cd a 18.11 +echo 'The first line.' > myfile 18.12 +hg ci -Ama 18.13 +echo 'The second line.' >> myfile 18.14 + 18.15 +#$ name: diff 18.16 + 18.17 +hg diff 18.18 + 18.19 +#$ name: extdiff 18.20 + 18.21 +hg extdiff 18.22 + 18.23 +#$ name: extdiff-ctx 18.24 + 18.25 +#$ ignore: ^\*\*\* a.* 18.26 + 18.27 +hg extdiff -o -NprcC5 18.28 + 18.29 +#$ name: 18.30 + 18.31 +exit 0
19.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 19.2 +++ b/es/examples/filenames Sat Oct 18 07:48:21 2008 -0500 19.3 @@ -0,0 +1,61 @@ 19.4 +#!/bin/bash 19.5 + 19.6 +hg init a 19.7 +cd a 19.8 +mkdir -p examples src/watcher 19.9 +touch COPYING MANIFEST.in README setup.py 19.10 +touch examples/performant.py examples/simple.py 19.11 +touch src/main.py src/watcher/_watcher.c src/watcher/watcher.py src/xyzzy.txt 19.12 + 19.13 +#$ name: files 19.14 + 19.15 +hg add COPYING README examples/simple.py 19.16 + 19.17 +#$ name: dirs 19.18 + 19.19 +hg status src 19.20 + 19.21 +#$ name: wdir-subdir 19.22 + 19.23 +cd src 19.24 +hg add -n 19.25 +hg add -n . 19.26 + 19.27 +#$ name: wdir-relname 19.28 + 19.29 +hg status 19.30 +hg status `hg root` 19.31 + 19.32 +#$ name: glob.star 19.33 + 19.34 +hg add 'glob:*.py' 19.35 + 19.36 +#$ name: glob.starstar 19.37 + 19.38 +cd .. 19.39 +hg status 'glob:**.py' 19.40 + 19.41 +#$ name: glob.star-starstar 19.42 + 19.43 +hg status 'glob:*.py' 19.44 +hg status 'glob:**.py' 19.45 + 19.46 +#$ name: glob.question 19.47 + 19.48 +hg status 'glob:**.?' 19.49 + 19.50 +#$ name: glob.range 19.51 + 19.52 +hg status 'glob:**[nr-t]' 19.53 + 19.54 +#$ name: glob.group 19.55 + 19.56 +hg status 'glob:*.{in,py}' 19.57 + 19.58 +#$ name: filter.include 19.59 + 19.60 +hg status -I '*.in' 19.61 + 19.62 +#$ name: filter.exclude 19.63 + 19.64 +hg status -X '**.py' src
20.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 20.2 +++ b/es/examples/hook.msglen Sat Oct 18 07:48:21 2008 -0500 20.3 @@ -0,0 +1,14 @@ 20.4 +#!/bin/sh 20.5 + 20.6 +hg init a 20.7 +cd a 20.8 +echo '[hooks]' > .hg/hgrc 20.9 +echo 'pretxncommit.msglen = test `hg tip --template {desc} | wc -c` -ge 10' >> .hg/hgrc 20.10 + 20.11 +#$ name: go 20.12 + 20.13 +cat .hg/hgrc 20.14 +echo a > a 20.15 +hg add a 20.16 +hg commit -A -m 'too short' 20.17 +hg commit -A -m 'long enough'
21.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 21.2 +++ b/es/examples/hook.simple Sat Oct 18 07:48:21 2008 -0500 21.3 @@ -0,0 +1,37 @@ 21.4 +#!/bin/bash 21.5 + 21.6 +#$ name: init 21.7 + 21.8 +hg init hook-test 21.9 +cd hook-test 21.10 +echo '[hooks]' >> .hg/hgrc 21.11 +echo 'commit = echo committed $HG_NODE' >> .hg/hgrc 21.12 +cat .hg/hgrc 21.13 +echo a > a 21.14 +hg add a 21.15 +hg commit -m 'testing commit hook' 21.16 + 21.17 +#$ name: ext 21.18 +#$ ignore: ^date of commit.* 21.19 + 21.20 +echo 'commit.when = echo -n "date of commit: "; date' >> .hg/hgrc 21.21 +echo a >> a 21.22 +hg commit -m 'i have two hooks' 21.23 + 21.24 +#$ name: 21.25 + 21.26 +echo '#!/bin/sh' >> check_bug_id 21.27 +echo '# check that a commit comment mentions a numeric bug id' >> check_bug_id 21.28 +echo 'hg log -r $1 --template {desc} | grep -q "\<bug *[0-9]"' >> check_bug_id 21.29 +chmod +x check_bug_id 21.30 + 21.31 +#$ name: pretxncommit 21.32 + 21.33 +cat check_bug_id 21.34 + 21.35 +echo 'pretxncommit.bug_id_required = ./check_bug_id $HG_NODE' >> .hg/hgrc 21.36 + 21.37 +echo a >> a 21.38 +hg commit -m 'i am not mentioning a bug id' 21.39 + 21.40 +hg commit -m 'i refer you to bug 666'
22.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 22.2 +++ b/es/examples/hook.ws Sat Oct 18 07:48:21 2008 -0500 22.3 @@ -0,0 +1,31 @@ 22.4 +#!/bin/bash 22.5 + 22.6 +hg init a 22.7 +cd a 22.8 +echo '[hooks]' > .hg/hgrc 22.9 +echo "pretxncommit.whitespace = hg export tip | (! egrep -q '^\\+.*[ \\t]$')" >> .hg/hgrc 22.10 + 22.11 +#$ name: simple 22.12 + 22.13 +cat .hg/hgrc 22.14 +echo 'a ' > a 22.15 +hg commit -A -m 'test with trailing whitespace' 22.16 +echo 'a' > a 22.17 +hg commit -A -m 'drop trailing whitespace and try again' 22.18 + 22.19 +#$ name: 22.20 + 22.21 +echo '[hooks]' > .hg/hgrc 22.22 +echo "pretxncommit.whitespace = .hg/check_whitespace.py" >> .hg/hgrc 22.23 +cp $EXAMPLE_DIR/data/check_whitespace.py .hg 22.24 + 22.25 +#$ name: better 22.26 + 22.27 +cat .hg/hgrc 22.28 +echo 'a ' >> a 22.29 +hg commit -A -m 'add new line with trailing whitespace' 22.30 +sed -i 's, *$,,' a 22.31 +hg commit -A -m 'trimmed trailing whitespace' 22.32 + 22.33 +#$ name: 22.34 +exit 0
23.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 23.2 +++ b/es/examples/issue29 Sat Oct 18 07:48:21 2008 -0500 23.3 @@ -0,0 +1,22 @@ 23.4 +#!/bin/bash 23.5 + 23.6 +#$ name: go 23.7 + 23.8 +hg init issue29 23.9 +cd issue29 23.10 +echo a > a 23.11 +hg ci -Ama 23.12 +echo b > b 23.13 +hg ci -Amb 23.14 +hg up 0 23.15 +mkdir b 23.16 +echo b > b/b 23.17 +hg ci -Amc 23.18 + 23.19 +#$ ignore: abort: Is a directory: .* 23.20 +hg merge 23.21 + 23.22 +#$ name: 23.23 +# This error is expected from the failed merge. 23.24 + 23.25 +exit 0
24.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 24.2 +++ b/es/examples/mq.dodiff Sat Oct 18 07:48:21 2008 -0500 24.3 @@ -0,0 +1,14 @@ 24.4 +#!/bin/bash 24.5 + 24.6 +#$ name: diff 24.7 + 24.8 +echo 'this is my original thought' > oldfile 24.9 +echo 'i have changed my mind' > newfile 24.10 + 24.11 +diff -u oldfile newfile > tiny.patch 24.12 + 24.13 +cat tiny.patch 24.14 + 24.15 +patch < tiny.patch 24.16 + 24.17 +cat oldfile
25.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 25.2 +++ b/es/examples/mq.guards Sat Oct 18 07:48:21 2008 -0500 25.3 @@ -0,0 +1,67 @@ 25.4 +#!/bin/bash 25.5 + 25.6 +echo '[extensions]' >> $HGRC 25.7 +echo 'hgext.mq =' >> $HGRC 25.8 + 25.9 +hg init a 25.10 +cd a 25.11 + 25.12 +#$ name: init 25.13 + 25.14 +hg qinit 25.15 +hg qnew hello.patch 25.16 +echo hello > hello 25.17 +hg add hello 25.18 +hg qrefresh 25.19 +hg qnew goodbye.patch 25.20 +echo goodbye > goodbye 25.21 +hg add goodbye 25.22 +hg qrefresh 25.23 + 25.24 +#$ name: qguard 25.25 + 25.26 +hg qguard 25.27 + 25.28 +#$ name: qguard.pos 25.29 + 25.30 +hg qguard +foo 25.31 +hg qguard 25.32 + 25.33 +#$ name: qguard.neg 25.34 + 25.35 +hg qguard hello.patch -quux 25.36 +hg qguard hello.patch 25.37 + 25.38 +#$ name: series 25.39 + 25.40 +cat .hg/patches/series 25.41 + 25.42 +#$ name: qselect.foo 25.43 + 25.44 +hg qpop -a 25.45 +hg qselect 25.46 +hg qselect foo 25.47 +hg qselect 25.48 + 25.49 +#$ name: qselect.cat 25.50 + 25.51 +cat .hg/patches/guards 25.52 + 25.53 +#$ name: qselect.qpush 25.54 +hg qpush -a 25.55 + 25.56 +#$ name: qselect.error 25.57 + 25.58 +hg qselect +foo 25.59 + 25.60 +#$ name: qselect.quux 25.61 + 25.62 +hg qselect quux 25.63 +hg qpop -a 25.64 +hg qpush -a 25.65 + 25.66 +#$ name: qselect.foobar 25.67 + 25.68 +hg qselect foo bar 25.69 +hg qpop -a 25.70 +hg qpush -a
26.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 26.2 +++ b/es/examples/mq.id Sat Oct 18 07:48:21 2008 -0500 26.3 @@ -0,0 +1,28 @@ 26.4 +#!/bin/sh 26.5 + 26.6 +echo '[extensions]' >> $HGRC 26.7 +echo 'hgext.mq =' >> $HGRC 26.8 + 26.9 +hg init a 26.10 +cd a 26.11 +hg qinit 26.12 +echo 'int x;' > test.c 26.13 +hg ci -Ama 26.14 + 26.15 +hg qnew first.patch 26.16 +echo 'float c;' >> test.c 26.17 +hg qrefresh 26.18 + 26.19 +hg qnew second.patch 26.20 +echo 'double u;' > other.c 26.21 +hg add other.c 26.22 +hg qrefresh 26.23 + 26.24 +#$ name: output 26.25 + 26.26 +hg qapplied 26.27 +hg log -r qbase:qtip 26.28 +hg export second.patch 26.29 + 26.30 +#$ name: 26.31 +exit 0
27.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 27.2 +++ b/es/examples/mq.qinit-help Sat Oct 18 07:48:21 2008 -0500 27.3 @@ -0,0 +1,7 @@ 27.4 +#!/bin/bash 27.5 + 27.6 +echo '[extensions]' >> $HGRC 27.7 +echo 'hgext.mq =' >> $HGRC 27.8 + 27.9 +#$ name: help 27.10 +hg help qinit
28.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 28.2 +++ b/es/examples/mq.tarball Sat Oct 18 07:48:21 2008 -0500 28.3 @@ -0,0 +1,51 @@ 28.4 +#!/bin/bash 28.5 + 28.6 +cp $EXAMPLE_DIR/data/netplug-*.tar.bz2 . 28.7 +ln -s /bin/true download 28.8 +export PATH=`pwd`:$PATH 28.9 + 28.10 +#$ name: download 28.11 + 28.12 +download netplug-1.2.5.tar.bz2 28.13 +tar jxf netplug-1.2.5.tar.bz2 28.14 +cd netplug-1.2.5 28.15 +hg init 28.16 +hg commit -q --addremove --message netplug-1.2.5 28.17 +cd .. 28.18 +hg clone netplug-1.2.5 netplug 28.19 + 28.20 +#$ name: 28.21 + 28.22 +cd netplug 28.23 +echo '[extensions]' >> $HGRC 28.24 +echo 'hgext.mq =' >> $HGRC 28.25 +cd .. 28.26 + 28.27 +#$ name: qinit 28.28 + 28.29 +cd netplug 28.30 +hg qinit 28.31 +hg qnew -m 'fix build problem with gcc 4' build-fix.patch 28.32 +perl -pi -e 's/int addr_len/socklen_t addr_len/' netlink.c 28.33 +hg qrefresh 28.34 +hg tip -p 28.35 + 28.36 +#$ name: newsource 28.37 + 28.38 +hg qpop -a 28.39 +cd .. 28.40 +download netplug-1.2.8.tar.bz2 28.41 +hg clone netplug-1.2.5 netplug-1.2.8 28.42 +cd netplug-1.2.8 28.43 +hg locate -0 | xargs -0 rm 28.44 +cd .. 28.45 +tar jxf netplug-1.2.8.tar.bz2 28.46 +cd netplug-1.2.8 28.47 +hg commit --addremove --message netplug-1.2.8 28.48 + 28.49 +#$ name: repush 28.50 + 28.51 +cd ../netplug 28.52 +hg pull ../netplug-1.2.8 28.53 +hg qpush -a 28.54 +
29.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 29.2 +++ b/es/examples/mq.tools Sat Oct 18 07:48:21 2008 -0500 29.3 @@ -0,0 +1,11 @@ 29.4 +#!/bin/bash 29.5 + 29.6 +cp $EXAMPLE_DIR/data/remove-redundant-null-checks.patch . 29.7 + 29.8 +#$ name: tools 29.9 +diffstat -p1 remove-redundant-null-checks.patch 29.10 + 29.11 +filterdiff -i '*/video/*' remove-redundant-null-checks.patch 29.12 + 29.13 +#$ name: lsdiff 29.14 +lsdiff -nvv remove-redundant-null-checks.patch
30.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 30.2 +++ b/es/examples/mq.tutorial Sat Oct 18 07:48:21 2008 -0500 30.3 @@ -0,0 +1,74 @@ 30.4 +#!/bin/bash 30.5 + 30.6 +echo '[extensions]' >> $HGRC 30.7 +echo 'hgext.mq =' >> $HGRC 30.8 + 30.9 +#$ name: qinit 30.10 + 30.11 +hg init mq-sandbox 30.12 +cd mq-sandbox 30.13 +echo 'line 1' > file1 30.14 +echo 'another line 1' > file2 30.15 +hg add file1 file2 30.16 +hg commit -m'first change' 30.17 + 30.18 +hg qinit 30.19 + 30.20 +#$ name: qnew 30.21 + 30.22 +hg tip 30.23 +hg qnew first.patch 30.24 +hg tip 30.25 +ls .hg/patches 30.26 + 30.27 +#$ name: qrefresh 30.28 +#$ ignore: \s+200[78]-.* 30.29 + 30.30 +echo 'line 2' >> file1 30.31 +hg diff 30.32 +hg qrefresh 30.33 +hg diff 30.34 +hg tip --style=compact --patch 30.35 + 30.36 +#$ name: qrefresh2 30.37 + 30.38 +echo 'line 3' >> file1 30.39 +hg status 30.40 +hg qrefresh 30.41 +hg tip --style=compact --patch 30.42 + 30.43 +#$ name: qnew2 30.44 + 30.45 +hg qnew second.patch 30.46 +hg log --style=compact --limit=2 30.47 +echo 'line 4' >> file1 30.48 +hg qrefresh 30.49 +hg tip --style=compact --patch 30.50 +hg annotate file1 30.51 + 30.52 +#$ name: qseries 30.53 + 30.54 +hg qseries 30.55 +hg qapplied 30.56 + 30.57 +#$ name: qpop 30.58 + 30.59 +hg qapplied 30.60 +hg qpop 30.61 +hg qseries 30.62 +hg qapplied 30.63 +cat file1 30.64 + 30.65 +#$ name: qpush-a 30.66 + 30.67 +hg qpush -a 30.68 +cat file1 30.69 + 30.70 +#$ name: add 30.71 + 30.72 +echo 'file 3, line 1' >> file3 30.73 +hg qnew add-file3.patch 30.74 +hg qnew -f add-file3.patch 30.75 + 30.76 +#$ name: 30.77 +exit 0
31.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 31.2 +++ b/es/examples/rename.divergent Sat Oct 18 07:48:21 2008 -0500 31.3 @@ -0,0 +1,33 @@ 31.4 +#!/bin/bash 31.5 + 31.6 +hg init orig 31.7 +cd orig 31.8 +echo foo > foo 31.9 +hg ci -A -m 'First commit' 31.10 +cd .. 31.11 + 31.12 +#$ name: clone 31.13 + 31.14 +hg clone orig anne 31.15 +hg clone orig bob 31.16 + 31.17 +#$ name: rename.anne 31.18 + 31.19 +cd anne 31.20 +hg mv foo bar 31.21 +hg ci -m 'Rename foo to bar' 31.22 + 31.23 +#$ name: rename.bob 31.24 + 31.25 +cd ../bob 31.26 +hg mv foo quux 31.27 +hg ci -m 'Rename foo to quux' 31.28 + 31.29 +#$ name: merge 31.30 +# See http://www.selenic.com/mercurial/bts/issue455 31.31 + 31.32 +cd ../orig 31.33 +hg pull -u ../anne 31.34 +hg pull ../bob 31.35 +hg merge 31.36 +ls
32.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 32.2 +++ b/es/examples/rollback Sat Oct 18 07:48:21 2008 -0500 32.3 @@ -0,0 +1,37 @@ 32.4 +#!/bin/bash 32.5 + 32.6 +hg init a 32.7 +cd a 32.8 +echo a > a 32.9 +hg ci -A -m 'First commit' 32.10 + 32.11 +echo a >> a 32.12 + 32.13 +#$ name: tip 32.14 + 32.15 +#$ name: commit 32.16 + 32.17 +hg status 32.18 +echo b > b 32.19 +hg commit -m 'Add file b' 32.20 + 32.21 +#$ name: status 32.22 + 32.23 +hg status 32.24 +hg tip 32.25 + 32.26 +#$ name: rollback 32.27 + 32.28 +hg rollback 32.29 +hg tip 32.30 +hg status 32.31 + 32.32 +#$ name: add 32.33 + 32.34 +hg add b 32.35 +hg commit -m 'Add file b, this time for real' 32.36 + 32.37 +#$ name: twice 32.38 + 32.39 +hg rollback 32.40 +hg rollback
33.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 33.2 +++ b/es/examples/run-example Sat Oct 18 07:48:21 2008 -0500 33.3 @@ -0,0 +1,391 @@ 33.4 +#!/usr/bin/env python 33.5 +# 33.6 +# This program takes something that resembles a shell script and runs 33.7 +# it, spitting input (commands from the script) and output into text 33.8 +# files, for use in examples. 33.9 + 33.10 +import cStringIO 33.11 +import errno 33.12 +import getopt 33.13 +import os 33.14 +import pty 33.15 +import re 33.16 +import select 33.17 +import shutil 33.18 +import signal 33.19 +import stat 33.20 +import sys 33.21 +import tempfile 33.22 +import time 33.23 + 33.24 +tex_subs = { 33.25 + '\\': '\\textbackslash{}', 33.26 + '{': '\\{', 33.27 + '}': '\\}', 33.28 + } 33.29 + 33.30 +def gensubs(s): 33.31 + start = 0 33.32 + for i, c in enumerate(s): 33.33 + sub = tex_subs.get(c) 33.34 + if sub: 33.35 + yield s[start:i] 33.36 + start = i + 1 33.37 + yield sub 33.38 + yield s[start:] 33.39 + 33.40 +def tex_escape(s): 33.41 + return ''.join(gensubs(s)) 33.42 + 33.43 +def maybe_unlink(name): 33.44 + try: 33.45 + os.unlink(name) 33.46 + return True 33.47 + except OSError, err: 33.48 + if err.errno != errno.ENOENT: 33.49 + raise 33.50 + return False 33.51 + 33.52 +def find_path_to(program): 33.53 + for p in os.environ.get('PATH', os.defpath).split(os.pathsep): 33.54 + name = os.path.join(p, program) 33.55 + if os.access(name, os.X_OK): 33.56 + return p 33.57 + return None 33.58 + 33.59 +class example: 33.60 + shell = '/usr/bin/env bash' 33.61 + ps1 = '__run_example_ps1__ ' 33.62 + ps2 = '__run_example_ps2__ ' 33.63 + pi_re = re.compile(r'#\$\s*(name|ignore):\s*(.*)$') 33.64 + 33.65 + timeout = 10 33.66 + 33.67 + def __init__(self, name, verbose): 33.68 + self.name = name 33.69 + self.verbose = verbose 33.70 + self.poll = select.poll() 33.71 + 33.72 + def parse(self): 33.73 + '''yield each hunk of input from the file.''' 33.74 + fp = open(self.name) 33.75 + cfp = cStringIO.StringIO() 33.76 + for line in fp: 33.77 + cfp.write(line) 33.78 + if not line.rstrip().endswith('\\'): 33.79 + yield cfp.getvalue() 33.80 + cfp.seek(0) 33.81 + cfp.truncate() 33.82 + 33.83 + def status(self, s): 33.84 + sys.stdout.write(s) 33.85 + if not s.endswith('\n'): 33.86 + sys.stdout.flush() 33.87 + 33.88 + def send(self, s): 33.89 + if self.verbose: 33.90 + print >> sys.stderr, '>', self.debugrepr(s) 33.91 + while s: 33.92 + count = os.write(self.cfd, s) 33.93 + s = s[count:] 33.94 + 33.95 + def debugrepr(self, s): 33.96 + rs = repr(s) 33.97 + limit = 60 33.98 + if len(rs) > limit: 33.99 + return ('%s%s ... [%d bytes]' % (rs[:limit], rs[0], len(s))) 33.100 + else: 33.101 + return rs 33.102 + 33.103 + timeout = 5 33.104 + 33.105 + def read(self, hint): 33.106 + events = self.poll.poll(self.timeout * 1000) 33.107 + if not events: 33.108 + print >> sys.stderr, ('[%stimed out after %d seconds]' % 33.109 + (hint, self.timeout)) 33.110 + os.kill(self.pid, signal.SIGHUP) 33.111 + return '' 33.112 + return os.read(self.cfd, 1024) 33.113 + 33.114 + def receive(self, hint): 33.115 + out = cStringIO.StringIO() 33.116 + while True: 33.117 + try: 33.118 + if self.verbose: 33.119 + sys.stderr.write('< ') 33.120 + s = self.read(hint) 33.121 + except OSError, err: 33.122 + if err.errno == errno.EIO: 33.123 + return '', '' 33.124 + raise 33.125 + if self.verbose: 33.126 + print >> sys.stderr, self.debugrepr(s) 33.127 + out.write(s) 33.128 + s = out.getvalue() 33.129 + if s.endswith(self.ps1): 33.130 + return self.ps1, s.replace('\r\n', '\n')[:-len(self.ps1)] 33.131 + if s.endswith(self.ps2): 33.132 + return self.ps2, s.replace('\r\n', '\n')[:-len(self.ps2)] 33.133 + 33.134 + def sendreceive(self, s, hint): 33.135 + self.send(s) 33.136 + ps, r = self.receive(hint) 33.137 + if r.startswith(s): 33.138 + r = r[len(s):] 33.139 + return ps, r 33.140 + 33.141 + def run(self): 33.142 + ofp = None 33.143 + basename = os.path.basename(self.name) 33.144 + self.status('running %s ' % basename) 33.145 + tmpdir = tempfile.mkdtemp(prefix=basename) 33.146 + 33.147 + # remove the marker file that we tell make to use to see if 33.148 + # this run succeeded 33.149 + maybe_unlink(self.name + '.run') 33.150 + 33.151 + rcfile = os.path.join(tmpdir, '.hgrc') 33.152 + rcfp = open(rcfile, 'w') 33.153 + print >> rcfp, '[ui]' 33.154 + print >> rcfp, "username = Bryan O'Sullivan <bos@serpentine.com>" 33.155 + 33.156 + rcfile = os.path.join(tmpdir, '.bashrc') 33.157 + rcfp = open(rcfile, 'w') 33.158 + print >> rcfp, 'PS1="%s"' % self.ps1 33.159 + print >> rcfp, 'PS2="%s"' % self.ps2 33.160 + print >> rcfp, 'unset HISTFILE' 33.161 + path = ['/usr/bin', '/bin'] 33.162 + hg = find_path_to('hg') 33.163 + if hg and hg not in path: 33.164 + path.append(hg) 33.165 + def re_export(envar): 33.166 + v = os.getenv(envar) 33.167 + if v is not None: 33.168 + print >> rcfp, 'export ' + envar + '=' + v 33.169 + print >> rcfp, 'export PATH=' + ':'.join(path) 33.170 + re_export('PYTHONPATH') 33.171 + print >> rcfp, 'export EXAMPLE_DIR="%s"' % os.getcwd() 33.172 + print >> rcfp, 'export HGMERGE=merge' 33.173 + print >> rcfp, 'export LANG=C' 33.174 + print >> rcfp, 'export LC_ALL=C' 33.175 + print >> rcfp, 'export TZ=GMT' 33.176 + print >> rcfp, 'export HGRC="%s/.hgrc"' % tmpdir 33.177 + print >> rcfp, 'export HGRCPATH=$HGRC' 33.178 + print >> rcfp, 'cd %s' % tmpdir 33.179 + rcfp.close() 33.180 + sys.stdout.flush() 33.181 + sys.stderr.flush() 33.182 + self.pid, self.cfd = pty.fork() 33.183 + if self.pid == 0: 33.184 + cmdline = ['/usr/bin/env', '-i', 'bash', '--noediting', 33.185 + '--noprofile', '--norc'] 33.186 + try: 33.187 + os.execv(cmdline[0], cmdline) 33.188 + except OSError, err: 33.189 + print >> sys.stderr, '%s: %s' % (cmdline[0], err.strerror) 33.190 + sys.stderr.flush() 33.191 + os._exit(0) 33.192 + self.poll.register(self.cfd, select.POLLIN | select.POLLERR | 33.193 + select.POLLHUP) 33.194 + 33.195 + prompts = { 33.196 + '': '', 33.197 + self.ps1: '$', 33.198 + self.ps2: '>', 33.199 + } 33.200 + 33.201 + ignore = [ 33.202 + r'\d+:[0-9a-f]{12}', # changeset number:hash 33.203 + r'[0-9a-f]{40}', # long changeset hash 33.204 + r'[0-9a-f]{12}', # short changeset hash 33.205 + r'^(?:---|\+\+\+) .*', # diff header with dates 33.206 + r'^date:.*', # date 33.207 + #r'^diff -r.*', # "diff -r" is followed by hash 33.208 + r'^# Date \d+ \d+', # hg patch header 33.209 + ] 33.210 + 33.211 + err = False 33.212 + read_hint = '' 33.213 + 33.214 + try: 33.215 + try: 33.216 + # eat first prompt string from shell 33.217 + self.read(read_hint) 33.218 + # setup env and prompt 33.219 + ps, output = self.sendreceive('source %s\n' % rcfile, 33.220 + read_hint) 33.221 + for hunk in self.parse(): 33.222 + # is this line a processing instruction? 33.223 + m = self.pi_re.match(hunk) 33.224 + if m: 33.225 + pi, rest = m.groups() 33.226 + if pi == 'name': 33.227 + self.status('.') 33.228 + out = rest 33.229 + if out in ('err', 'lxo', 'out', 'run', 'tmp'): 33.230 + print >> sys.stderr, ('%s: illegal section ' 33.231 + 'name %r' % 33.232 + (self.name, out)) 33.233 + return 1 33.234 + assert os.sep not in out 33.235 + if ofp is not None: 33.236 + ofp.close() 33.237 + err |= self.rename_output(ofp_basename, ignore) 33.238 + if out: 33.239 + ofp_basename = '%s.%s' % (self.name, out) 33.240 + read_hint = ofp_basename + ' ' 33.241 + ofp = open(ofp_basename + '.tmp', 'w') 33.242 + else: 33.243 + ofp = None 33.244 + elif pi == 'ignore': 33.245 + ignore.append(rest) 33.246 + elif hunk.strip(): 33.247 + # it's something we should execute 33.248 + newps, output = self.sendreceive(hunk, read_hint) 33.249 + if not ofp: 33.250 + continue 33.251 + # first, print the command we ran 33.252 + if not hunk.startswith('#'): 33.253 + nl = hunk.endswith('\n') 33.254 + hunk = ('%s \\textbf{%s}' % 33.255 + (prompts[ps], 33.256 + tex_escape(hunk.rstrip('\n')))) 33.257 + if nl: hunk += '\n' 33.258 + ofp.write(hunk) 33.259 + # then its output 33.260 + ofp.write(tex_escape(output)) 33.261 + ps = newps 33.262 + self.status('\n') 33.263 + except: 33.264 + print >> sys.stderr, '(killed)' 33.265 + os.kill(self.pid, signal.SIGKILL) 33.266 + pid, rc = os.wait() 33.267 + raise 33.268 + else: 33.269 + try: 33.270 + ps, output = self.sendreceive('exit\n', read_hint) 33.271 + if ofp is not None: 33.272 + ofp.write(output) 33.273 + ofp.close() 33.274 + err |= self.rename_output(ofp_basename, ignore) 33.275 + os.close(self.cfd) 33.276 + except IOError: 33.277 + pass 33.278 + os.kill(self.pid, signal.SIGTERM) 33.279 + pid, rc = os.wait() 33.280 + err = err or rc 33.281 + if err: 33.282 + if os.WIFEXITED(rc): 33.283 + print >> sys.stderr, '(exit %s)' % os.WEXITSTATUS(rc) 33.284 + elif os.WIFSIGNALED(rc): 33.285 + print >> sys.stderr, '(signal %s)' % os.WTERMSIG(rc) 33.286 + else: 33.287 + open(self.name + '.run', 'w') 33.288 + return err 33.289 + finally: 33.290 + shutil.rmtree(tmpdir) 33.291 + 33.292 + def rename_output(self, base, ignore): 33.293 + mangle_re = re.compile('(?:' + '|'.join(ignore) + ')') 33.294 + def mangle(s): 33.295 + return mangle_re.sub('', s) 33.296 + def matchfp(fp1, fp2): 33.297 + while True: 33.298 + s1 = mangle(fp1.readline()) 33.299 + s2 = mangle(fp2.readline()) 33.300 + if cmp(s1, s2): 33.301 + break 33.302 + if not s1: 33.303 + return True 33.304 + return False 33.305 + 33.306 + oldname = base + '.out' 33.307 + tmpname = base + '.tmp' 33.308 + errname = base + '.err' 33.309 + errfp = open(errname, 'w+') 33.310 + for line in open(tmpname): 33.311 + errfp.write(mangle_re.sub('', line)) 33.312 + os.rename(tmpname, base + '.lxo') 33.313 + errfp.seek(0) 33.314 + try: 33.315 + oldfp = open(oldname) 33.316 + except IOError, err: 33.317 + if err.errno != errno.ENOENT: 33.318 + raise 33.319 + os.rename(errname, oldname) 33.320 + return False 33.321 + if matchfp(oldfp, errfp): 33.322 + os.unlink(errname) 33.323 + return False 33.324 + else: 33.325 + print >> sys.stderr, '\nOutput of %s has changed!' % base 33.326 + os.system('diff -u %s %s 1>&2' % (oldname, errname)) 33.327 + return True 33.328 + 33.329 +def print_help(exit, msg=None): 33.330 + if msg: 33.331 + print >> sys.stderr, 'Error:', msg 33.332 + print >> sys.stderr, 'Usage: run-example [options] [test...]' 33.333 + print >> sys.stderr, 'Options:' 33.334 + print >> sys.stderr, ' -a --all run all tests in this directory' 33.335 + print >> sys.stderr, ' -h --help print this help message' 33.336 + print >> sys.stderr, ' -v --verbose display extra debug output' 33.337 + sys.exit(exit) 33.338 + 33.339 +def main(path='.'): 33.340 + opts, args = getopt.getopt(sys.argv[1:], '?ahv', 33.341 + ['all', 'help', 'verbose']) 33.342 + verbose = False 33.343 + run_all = False 33.344 + for o, a in opts: 33.345 + if o in ('-h', '-?', '--help'): 33.346 + print_help(0) 33.347 + if o in ('-a', '--all'): 33.348 + run_all = True 33.349 + if o in ('-v', '--verbose'): 33.350 + verbose = True 33.351 + errs = 0 33.352 + if args: 33.353 + for a in args: 33.354 + try: 33.355 + st = os.lstat(a) 33.356 + except OSError, err: 33.357 + print >> sys.stderr, '%s: %s' % (a, err.strerror) 33.358 + errs += 1 33.359 + continue 33.360 + if stat.S_ISREG(st.st_mode) and st.st_mode & 0111: 33.361 + if example(a, verbose).run(): 33.362 + errs += 1 33.363 + else: 33.364 + print >> sys.stderr, '%s: not a file, or not executable' % a 33.365 + errs += 1 33.366 + elif run_all: 33.367 + names = os.listdir(path) 33.368 + names.sort() 33.369 + for name in names: 33.370 + if name == 'run-example' or name.startswith('.'): continue 33.371 + if name.endswith('.out') or name.endswith('~'): continue 33.372 + if name.endswith('.run'): continue 33.373 + pathname = os.path.join(path, name) 33.374 + try: 33.375 + st = os.lstat(pathname) 33.376 + except OSError, err: 33.377 + # could be an output file that was removed while we ran 33.378 + if err.errno != errno.ENOENT: 33.379 + raise 33.380 + continue 33.381 + if stat.S_ISREG(st.st_mode) and st.st_mode & 0111: 33.382 + if example(pathname, verbose).run(): 33.383 + errs += 1 33.384 + print >> open(os.path.join(path, '.run'), 'w'), time.asctime() 33.385 + else: 33.386 + print_help(1, msg='no test names given, and --all not provided') 33.387 + return errs 33.388 + 33.389 +if __name__ == '__main__': 33.390 + try: 33.391 + sys.exit(main()) 33.392 + except KeyboardInterrupt: 33.393 + print >> sys.stderr, 'interrupted!' 33.394 + sys.exit(1)
34.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 34.2 +++ b/es/examples/svn-long.txt Sat Oct 18 07:48:21 2008 -0500 34.3 @@ -0,0 +1,11 @@ 34.4 +------------------------------------------------------------------------ 34.5 +r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines 34.6 +Changed paths: 34.7 + M /gen2/trunk/src/linux-kernel/infiniband/core/cma.c 34.8 + 34.9 +On reporting a route error, also include the status for the error, 34.10 +rather than indicating a status of 0 when an error has occurred. 34.11 + 34.12 +Signed-off-by: Sean Hefty <sean.hefty@intel.com> 34.13 + 34.14 +------------------------------------------------------------------------
35.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 35.2 +++ b/es/examples/svn-short.txt Sat Oct 18 07:48:21 2008 -0500 35.3 @@ -0,0 +1,9 @@ 35.4 +------------------------------------------------------------------------ 35.5 +r9653 | sean.hefty | 2006-09-27 14:39:55 -0700 (Wed, 27 Sep 2006) | 5 lines 35.6 + 35.7 +On reporting a route error, also include the status for the error, 35.8 +rather than indicating a status of 0 when an error has occurred. 35.9 + 35.10 +Signed-off-by: Sean Hefty <sean.hefty@intel.com> 35.11 + 35.12 +------------------------------------------------------------------------
36.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 36.2 +++ b/es/examples/svn.style Sat Oct 18 07:48:21 2008 -0500 36.3 @@ -0,0 +1,2 @@ 36.4 +header = '------------------------------------------------------------------------\n\n' 36.5 +changeset = svn.template
37.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 37.2 +++ b/es/examples/svn.template Sat Oct 18 07:48:21 2008 -0500 37.3 @@ -0,0 +1,5 @@ 37.4 +r{rev} | {author|user} | {date|isodate} ({date|rfc822date}) 37.5 + 37.6 +{desc|strip|fill76} 37.7 + 37.8 +------------------------------------------------------------------------
38.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 38.2 +++ b/es/examples/tag Sat Oct 18 07:48:21 2008 -0500 38.3 @@ -0,0 +1,44 @@ 38.4 +#!/bin/bash 38.5 + 38.6 +#$ name: init 38.7 + 38.8 +hg init mytag 38.9 +cd mytag 38.10 + 38.11 +echo hello > myfile 38.12 +hg commit -A -m 'Initial commit' 38.13 + 38.14 +#$ name: tag 38.15 + 38.16 +hg tag v1.0 38.17 + 38.18 +#$ name: tags 38.19 + 38.20 +hg tags 38.21 + 38.22 +#$ name: log 38.23 + 38.24 +hg log 38.25 + 38.26 +#$ name: log.v1.0 38.27 + 38.28 +echo goodbye > myfile2 38.29 +hg commit -A -m 'Second commit' 38.30 +hg log -r v1.0 38.31 + 38.32 +#$ name: remove 38.33 + 38.34 +hg tag --remove v1.0 38.35 +hg tags 38.36 + 38.37 +#$ name: replace 38.38 + 38.39 +hg tag -r 1 v1.1 38.40 +hg tags 38.41 +hg tag -r 2 v1.1 38.42 +hg tag -f -r 2 v1.1 38.43 +hg tags 38.44 + 38.45 +#$ name: tip 38.46 + 38.47 +hg tip
39.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 39.2 +++ b/es/examples/template.simple Sat Oct 18 07:48:21 2008 -0500 39.3 @@ -0,0 +1,96 @@ 39.4 +#!/bin/bash 39.5 + 39.6 +# So many different bits of random output, it would be a nightmare to 39.7 +# ignore each individually. 39.8 +#$ ignore: .* 39.9 + 39.10 +hg init myrepo 39.11 +cd myrepo 39.12 +echo hello > hello 39.13 +hg commit -Am'added hello' 39.14 + 39.15 +echo hello >> hello 39.16 +echo goodbye > goodbye 39.17 +echo ' added line to end of <<hello>> file.' > ../msg 39.18 +echo '' >> ../msg 39.19 +echo 'in addition, added a file with the helpful name (at least i hope that some might consider it so) of goodbye.' >> ../msg 39.20 + 39.21 +hg commit -Al../msg 39.22 + 39.23 +hg tag mytag 39.24 +hg tag v0.1 39.25 + 39.26 +#$ name: normal 39.27 + 39.28 +hg log -r1 39.29 + 39.30 +#$ name: compact 39.31 + 39.32 +hg log --style compact 39.33 + 39.34 +#$ name: changelog 39.35 + 39.36 +hg log --style changelog 39.37 + 39.38 +#$ name: simplest 39.39 + 39.40 +hg log -r1 --template 'i saw a changeset\n' 39.41 + 39.42 +#$ name: simplesub 39.43 + 39.44 +hg log --template 'i saw a changeset: {desc}\n' 39.45 + 39.46 +#$ name: keywords 39.47 + 39.48 +hg log -r1 --template 'author: {author}\n' 39.49 +hg log -r1 --template 'desc:\n{desc}\n' 39.50 +hg log -r1 --template 'files: {files}\n' 39.51 +hg log -r1 --template 'file_adds: {file_adds}\n' 39.52 +hg log -r1 --template 'file_dels: {file_dels}\n' 39.53 +hg log -r1 --template 'node: {node}\n' 39.54 +hg log -r1 --template 'parents: {parents}\n' 39.55 +hg log -r1 --template 'rev: {rev}\n' 39.56 +hg log -r1 --template 'tags: {tags}\n' 39.57 + 39.58 +#$ name: datekeyword 39.59 + 39.60 +hg log -r1 --template 'date: {date}\n' 39.61 +hg log -r1 --template 'date: {date|isodate}\n' 39.62 + 39.63 +#$ name: manyfilters 39.64 + 39.65 +hg log -r1 --template '{author}\n' 39.66 +hg log -r1 --template '{author|domain}\n' 39.67 +hg log -r1 --template '{author|email}\n' 39.68 +hg log -r1 --template '{author|obfuscate}\n' | cut -c-76 39.69 +hg log -r1 --template '{author|person}\n' 39.70 +hg log -r1 --template '{author|user}\n' 39.71 + 39.72 +hg log -r1 --template 'looks almost right, but actually garbage: {date}\n' 39.73 +hg log -r1 --template '{date|age}\n' 39.74 +hg log -r1 --template '{date|date}\n' 39.75 +hg log -r1 --template '{date|hgdate}\n' 39.76 +hg log -r1 --template '{date|isodate}\n' 39.77 +hg log -r1 --template '{date|rfc822date}\n' 39.78 +hg log -r1 --template '{date|shortdate}\n' 39.79 + 39.80 +hg log -r1 --template '{desc}\n' | cut -c-76 39.81 +hg log -r1 --template '{desc|addbreaks}\n' | cut -c-76 39.82 +hg log -r1 --template '{desc|escape}\n' | cut -c-76 39.83 +hg log -r1 --template '{desc|fill68}\n' 39.84 +hg log -r1 --template '{desc|fill76}\n' 39.85 +hg log -r1 --template '{desc|firstline}\n' 39.86 +hg log -r1 --template '{desc|strip}\n' | cut -c-76 39.87 +hg log -r1 --template '{desc|tabindent}\n' | expand | cut -c-76 39.88 + 39.89 +hg log -r1 --template '{node}\n' 39.90 +hg log -r1 --template '{node|short}\n' 39.91 + 39.92 +#$ name: combine 39.93 + 39.94 +hg log -r1 --template 'description:\n\t{desc|strip|fill68|tabindent}\n' 39.95 + 39.96 +#$ name: rev 39.97 + 39.98 +echo 'changeset = "rev: {rev}\n"' > rev 39.99 +hg log -l1 --style ./rev
40.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 40.2 +++ b/es/examples/template.svnstyle Sat Oct 18 07:48:21 2008 -0500 40.3 @@ -0,0 +1,70 @@ 40.4 +#!/bin/bash 40.5 + 40.6 +svn() { 40.7 + cat $EXAMPLE_DIR/svn-short.txt 40.8 +} 40.9 + 40.10 +#$ name: short 40.11 + 40.12 +svn log -r9653 40.13 + 40.14 +#$ name: 40.15 + 40.16 +hg init myrepo 40.17 +cd myrepo 40.18 + 40.19 +echo hello > hello 40.20 +hg commit -Am'added hello' 40.21 + 40.22 +echo hello >> hello 40.23 +echo goodbye > goodbye 40.24 +echo ' added line to end of <<hello>> file.' > ../msg 40.25 +echo '' >> ../msg 40.26 +echo 'in addition, added a file with the helpful name (at least i hope that some might consider it so) of goodbye.' >> ../msg 40.27 + 40.28 +hg commit -Al../msg 40.29 + 40.30 +hg tag mytag 40.31 +hg tag v0.1 40.32 + 40.33 +echo 'changeset = "{node|short}\n"' > svn.style 40.34 + 40.35 +#$ name: id 40.36 + 40.37 +hg log -r0 --template '{node}' 40.38 + 40.39 +#$ name: simplest 40.40 + 40.41 +cat svn.style 40.42 +hg log -r1 --style svn.style 40.43 + 40.44 +#$ name: 40.45 + 40.46 +echo 'changeset =' > broken.style 40.47 + 40.48 +#$ name: syntax.input 40.49 + 40.50 +cat broken.style 40.51 + 40.52 +#$ name: syntax.error 40.53 + 40.54 +hg log -r1 --style broken.style 40.55 + 40.56 +#$ name: 40.57 + 40.58 +cp $EXAMPLE_DIR/svn.style . 40.59 +cp $EXAMPLE_DIR/svn.template . 40.60 + 40.61 +#$ name: template 40.62 + 40.63 +cat svn.template 40.64 + 40.65 +#$ name: style 40.66 + 40.67 +cat svn.style 40.68 + 40.69 +#$ name: result 40.70 +#$ ignore: \| 200[78].* 40.71 + 40.72 +hg log -r1 --style svn.style 40.73 +
41.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 41.2 +++ b/es/examples/tour Sat Oct 18 07:48:21 2008 -0500 41.3 @@ -0,0 +1,194 @@ 41.4 +#!/bin/bash 41.5 + 41.6 +#$ name: version 41.7 + 41.8 +hg version 41.9 + 41.10 +#$ name: help 41.11 + 41.12 +hg help init 41.13 + 41.14 +#$ name: clone 41.15 + 41.16 +hg clone http://hg.serpentine.com/tutorial/hello 41.17 + 41.18 +#$ name: ls 41.19 +#$ ignore: ^drwx.* 41.20 +#$ ignore: ^total \d+ 41.21 + 41.22 +ls -l 41.23 +ls hello 41.24 + 41.25 +#$ name: ls-a 41.26 + 41.27 +cd hello 41.28 +ls -a 41.29 + 41.30 +#$ name: log 41.31 + 41.32 +hg log 41.33 + 41.34 +#$ name: log-r 41.35 + 41.36 +hg log -r 3 41.37 +hg log -r 0272e0d5a517 41.38 +hg log -r 1 -r 4 41.39 + 41.40 +#$ name: log.range 41.41 + 41.42 +hg log -r 2:4 41.43 + 41.44 +#$ name: log-v 41.45 + 41.46 +hg log -v -r 3 41.47 + 41.48 +#$ name: log-vp 41.49 + 41.50 +hg log -v -p -r 2 41.51 + 41.52 +#$ name: reclone 41.53 + 41.54 +cd .. 41.55 +hg clone hello my-hello 41.56 +cd my-hello 41.57 + 41.58 +#$ name: sed 41.59 + 41.60 +sed -i '/printf/a\\tprintf("hello again!\\n");' hello.c 41.61 + 41.62 +#$ name: status 41.63 + 41.64 +ls 41.65 +hg status 41.66 + 41.67 +#$ name: diff 41.68 + 41.69 +hg diff 41.70 + 41.71 +#$ name: 41.72 + 41.73 +export HGEDITOR='echo Added an extra line of output >' 41.74 + 41.75 +#$ name: commit 41.76 + 41.77 +hg commit 41.78 + 41.79 +#$ name: merge.dummy1 41.80 + 41.81 +hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-hello 41.82 + 41.83 +#$ name: tip 41.84 + 41.85 +hg tip -vp 41.86 + 41.87 +#$ name: clone-pull 41.88 + 41.89 +cd .. 41.90 +hg clone hello hello-pull 41.91 + 41.92 +#$ name: incoming 41.93 + 41.94 +cd hello-pull 41.95 +hg incoming ../my-hello 41.96 + 41.97 +#$ name: pull 41.98 + 41.99 +hg tip 41.100 +hg pull ../my-hello 41.101 +hg tip 41.102 + 41.103 +#$ name: update 41.104 + 41.105 +grep printf hello.c 41.106 +hg update tip 41.107 +grep printf hello.c 41.108 + 41.109 +#$ name: parents 41.110 + 41.111 +hg parents 41.112 + 41.113 +#$ name: older 41.114 + 41.115 +hg update 2 41.116 +hg parents 41.117 +hg update 41.118 + 41.119 +#$ name: clone-push 41.120 + 41.121 +cd .. 41.122 +hg clone hello hello-push 41.123 + 41.124 +#$ name: outgoing 41.125 + 41.126 +cd my-hello 41.127 +hg outgoing ../hello-push 41.128 + 41.129 +#$ name: push 41.130 + 41.131 +hg push ../hello-push 41.132 + 41.133 +#$ name: push.nothing 41.134 + 41.135 +hg push ../hello-push 41.136 + 41.137 +#$ name: outgoing.net 41.138 + 41.139 +hg outgoing http://hg.serpentine.com/tutorial/hello 41.140 + 41.141 +#$ name: push.net 41.142 + 41.143 +hg push http://hg.serpentine.com/tutorial/hello 41.144 + 41.145 +#$ name: merge.clone 41.146 + 41.147 +cd .. 41.148 +hg clone hello my-new-hello 41.149 +cd my-new-hello 41.150 +sed -i '/printf/i\\tprintf("once more, hello.\\n");' hello.c 41.151 +hg commit -m 'A new hello for a new day.' 41.152 + 41.153 +#$ name: merge.dummy2 41.154 + 41.155 +hg log -r 5 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV5.my-new-hello 41.156 + 41.157 +#$ name: merge.cat 41.158 + 41.159 +cat hello.c 41.160 +cat ../my-hello/hello.c 41.161 + 41.162 +#$ name: merge.pull 41.163 + 41.164 +hg pull ../my-hello 41.165 + 41.166 +#$ name: merge.dummy3 41.167 + 41.168 +hg log -r 6 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV6.my-new-hello 41.169 + 41.170 +#$ name: merge.heads 41.171 + 41.172 +hg heads 41.173 + 41.174 +#$ name: merge.update 41.175 + 41.176 +hg update 41.177 + 41.178 +#$ name: merge.merge 41.179 + 41.180 +hg merge 41.181 + 41.182 +#$ name: merge.parents 41.183 + 41.184 +hg parents 41.185 +cat hello.c 41.186 + 41.187 +#$ name: merge.commit 41.188 + 41.189 +hg commit -m 'Merged changes' 41.190 + 41.191 +#$ name: merge.dummy4 41.192 + 41.193 +hg log -r 7 | grep changeset | cut -c 16-19 2>/dev/null > /tmp/REV7.my-new-hello 41.194 + 41.195 +#$ name: merge.tip 41.196 + 41.197 +hg tip
42.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 42.2 +++ b/es/examples/tour-merge-conflict Sat Oct 18 07:48:21 2008 -0500 42.3 @@ -0,0 +1,73 @@ 42.4 +#!/bin/bash 42.5 + 42.6 +hg init scam 42.7 +cd scam 42.8 + 42.9 +#$ name: wife 42.10 + 42.11 +cat > letter.txt <<EOF 42.12 +Greetings! 42.13 + 42.14 +I am Mariam Abacha, the wife of former 42.15 +Nigerian dictator Sani Abacha. 42.16 +EOF 42.17 + 42.18 +hg add letter.txt 42.19 +hg commit -m '419 scam, first draft' 42.20 + 42.21 +#$ name: cousin 42.22 + 42.23 +cd .. 42.24 +hg clone scam scam-cousin 42.25 +cd scam-cousin 42.26 + 42.27 +cat > letter.txt <<EOF 42.28 +Greetings! 42.29 + 42.30 +I am Shehu Musa Abacha, cousin to the former 42.31 +Nigerian dictator Sani Abacha. 42.32 +EOF 42.33 + 42.34 +hg commit -m '419 scam, with cousin' 42.35 + 42.36 +#$ name: son 42.37 + 42.38 +cd .. 42.39 +hg clone scam scam-son 42.40 +cd scam-son 42.41 + 42.42 +cat > letter.txt <<EOF 42.43 +Greetings! 42.44 + 42.45 +I am Alhaji Abba Abacha, son of the former 42.46 +Nigerian dictator Sani Abacha. 42.47 +EOF 42.48 + 42.49 +hg commit -m '419 scam, with son' 42.50 + 42.51 +#$ name: pull 42.52 + 42.53 +cd .. 42.54 +hg clone scam-cousin scam-merge 42.55 +cd scam-merge 42.56 +hg pull -u ../scam-son 42.57 + 42.58 +#$ name: merge 42.59 +#$ ignore: [<>]{7} /tmp/.* 42.60 + 42.61 +export HGMERGE=merge 42.62 +hg merge 42.63 +cat letter.txt 42.64 + 42.65 +#$ name: commit 42.66 + 42.67 +cat > letter.txt <<EOF 42.68 +Greetings! 42.69 + 42.70 +I am Bryan O'Sullivan, no relation of the former 42.71 +Nigerian dictator Sani Abacha. 42.72 +EOF 42.73 + 42.74 +hg resolve -m letter.txt 42.75 +hg commit -m 'Send me your money' 42.76 +hg tip
43.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 43.2 +++ b/es/fblinks Sat Oct 18 07:48:21 2008 -0500 43.3 @@ -0,0 +1,1 @@ 43.4 +../en/fblinks 43.5 \ No newline at end of file
44.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 44.2 +++ b/es/filelog.svg Sat Oct 18 07:48:21 2008 -0500 44.3 @@ -0,0 +1,381 @@ 44.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 44.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 44.6 +<svg 44.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 44.8 + xmlns:cc="http://creativecommons.org/ns#" 44.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 44.10 + xmlns:svg="http://www.w3.org/2000/svg" 44.11 + xmlns="http://www.w3.org/2000/svg" 44.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 44.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 44.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 44.15 + width="744.09448819" 44.16 + height="1052.3622047" 44.17 + id="svg2" 44.18 + sodipodi:version="0.32" 44.19 + inkscape:version="0.46" 44.20 + sodipodi:docname="filelog.svg" 44.21 + sodipodi:docbase="/home/arun/hgbook/en" 44.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 44.23 + <defs 44.24 + id="defs4"> 44.25 + <inkscape:perspective 44.26 + sodipodi:type="inkscape:persp3d" 44.27 + inkscape:vp_x="0 : 526.18109 : 1" 44.28 + inkscape:vp_y="0 : 1000 : 0" 44.29 + inkscape:vp_z="744.09448 : 526.18109 : 1" 44.30 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 44.31 + id="perspective57" /> 44.32 + <marker 44.33 + inkscape:stockid="Arrow1Mend" 44.34 + orient="auto" 44.35 + refY="0.0" 44.36 + refX="0.0" 44.37 + id="Arrow1Mend" 44.38 + style="overflow:visible;"> 44.39 + <path 44.40 + id="path3128" 44.41 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 44.42 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 44.43 + transform="scale(0.4) rotate(180) translate(10,0)" /> 44.44 + </marker> 44.45 + <linearGradient 44.46 + id="linearGradient2887"> 44.47 + <stop 44.48 + style="stop-color:#91cfcf;stop-opacity:1;" 44.49 + offset="0" 44.50 + id="stop2889" /> 44.51 + <stop 44.52 + style="stop-color:aqua;stop-opacity:0;" 44.53 + offset="1" 44.54 + id="stop2891" /> 44.55 + </linearGradient> 44.56 + <linearGradient 44.57 + id="linearGradient2795"> 44.58 + <stop 44.59 + style="stop-color:#ccc;stop-opacity:1;" 44.60 + offset="0" 44.61 + id="stop2797" /> 44.62 + <stop 44.63 + style="stop-color:#ccc;stop-opacity:0;" 44.64 + offset="1" 44.65 + id="stop2799" /> 44.66 + </linearGradient> 44.67 + <linearGradient 44.68 + inkscape:collect="always" 44.69 + xlink:href="#linearGradient2795" 44.70 + id="linearGradient3170" 44.71 + gradientUnits="userSpaceOnUse" 44.72 + gradientTransform="translate(121.2183,94.95434)" 44.73 + x1="81.322357" 44.74 + y1="404.34424" 44.75 + x2="201.52036" 44.76 + y2="373.03967" /> 44.77 + <linearGradient 44.78 + inkscape:collect="always" 44.79 + xlink:href="#linearGradient2887" 44.80 + id="linearGradient3172" 44.81 + gradientUnits="userSpaceOnUse" 44.82 + gradientTransform="translate(0,12)" 44.83 + x1="62.634491" 44.84 + y1="503.3392" 44.85 + x2="248.49242" 44.86 + y2="462.94327" /> 44.87 + <linearGradient 44.88 + inkscape:collect="always" 44.89 + xlink:href="#linearGradient2795" 44.90 + id="linearGradient3174" 44.91 + gradientUnits="userSpaceOnUse" 44.92 + gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 44.93 + x1="81.322357" 44.94 + y1="404.34424" 44.95 + x2="201.52036" 44.96 + y2="373.03967" /> 44.97 + <linearGradient 44.98 + inkscape:collect="always" 44.99 + xlink:href="#linearGradient2887" 44.100 + id="linearGradient3176" 44.101 + gradientUnits="userSpaceOnUse" 44.102 + gradientTransform="translate(0,12)" 44.103 + x1="62.634491" 44.104 + y1="503.3392" 44.105 + x2="248.49242" 44.106 + y2="462.94327" /> 44.107 + <linearGradient 44.108 + inkscape:collect="always" 44.109 + xlink:href="#linearGradient2795" 44.110 + id="linearGradient3208" 44.111 + gradientUnits="userSpaceOnUse" 44.112 + gradientTransform="matrix(1.001035,0,0,0.653159,236.7075,153.0415)" 44.113 + x1="81.322357" 44.114 + y1="404.34424" 44.115 + x2="201.52036" 44.116 + y2="373.03967" /> 44.117 + <linearGradient 44.118 + inkscape:collect="always" 44.119 + xlink:href="#linearGradient2887" 44.120 + id="linearGradient3210" 44.121 + gradientUnits="userSpaceOnUse" 44.122 + gradientTransform="translate(0,12)" 44.123 + x1="62.634491" 44.124 + y1="503.3392" 44.125 + x2="248.49242" 44.126 + y2="462.94327" /> 44.127 + <linearGradient 44.128 + inkscape:collect="always" 44.129 + xlink:href="#linearGradient2795" 44.130 + id="linearGradient3212" 44.131 + gradientUnits="userSpaceOnUse" 44.132 + gradientTransform="translate(121.2183,94.95434)" 44.133 + x1="81.322357" 44.134 + y1="404.34424" 44.135 + x2="201.52036" 44.136 + y2="373.03967" /> 44.137 + <linearGradient 44.138 + inkscape:collect="always" 44.139 + xlink:href="#linearGradient2887" 44.140 + id="linearGradient3214" 44.141 + gradientUnits="userSpaceOnUse" 44.142 + gradientTransform="translate(0,12)" 44.143 + x1="62.634491" 44.144 + y1="503.3392" 44.145 + x2="248.49242" 44.146 + y2="462.94327" /> 44.147 + <linearGradient 44.148 + inkscape:collect="always" 44.149 + xlink:href="#linearGradient2795" 44.150 + id="linearGradient3256" 44.151 + gradientUnits="userSpaceOnUse" 44.152 + gradientTransform="matrix(1.2343775,0,0,0.9981848,103.25588,95.681888)" 44.153 + x1="74.301666" 44.154 + y1="431.67441" 44.155 + x2="260.05884" 44.156 + y2="369.95322" /> 44.157 + <linearGradient 44.158 + inkscape:collect="always" 44.159 + xlink:href="#linearGradient2887" 44.160 + id="linearGradient3258" 44.161 + gradientUnits="userSpaceOnUse" 44.162 + gradientTransform="matrix(1.228929,0,0,0.9972824,-62.037003,13.312997)" 44.163 + x1="62.634491" 44.164 + y1="503.3392" 44.165 + x2="248.49242" 44.166 + y2="462.94327" /> 44.167 + <linearGradient 44.168 + inkscape:collect="always" 44.169 + xlink:href="#linearGradient2795" 44.170 + id="linearGradient3260" 44.171 + gradientUnits="userSpaceOnUse" 44.172 + gradientTransform="matrix(1.2300738,0,0,0.6517275,219.97511,153.61527)" 44.173 + x1="74.387527" 44.174 + y1="431.80576" 44.175 + x2="259.97339" 44.176 + y2="369.82224" /> 44.177 + <linearGradient 44.178 + inkscape:collect="always" 44.179 + xlink:href="#linearGradient2887" 44.180 + id="linearGradient3262" 44.181 + gradientUnits="userSpaceOnUse" 44.182 + gradientTransform="matrix(1.2289272,0,0,0.9972824,-62.036756,13.312985)" 44.183 + x1="62.634491" 44.184 + y1="503.3392" 44.185 + x2="248.49242" 44.186 + y2="462.94327" /> 44.187 + </defs> 44.188 + <sodipodi:namedview 44.189 + id="base" 44.190 + pagecolor="#ffffff" 44.191 + bordercolor="#666666" 44.192 + borderopacity="1.0" 44.193 + gridtolerance="10000" 44.194 + guidetolerance="10" 44.195 + objecttolerance="10" 44.196 + inkscape:pageopacity="0.0" 44.197 + inkscape:pageshadow="2" 44.198 + inkscape:zoom="1.4" 44.199 + inkscape:cx="455.8122" 44.200 + inkscape:cy="520" 44.201 + inkscape:document-units="px" 44.202 + inkscape:current-layer="layer1" 44.203 + inkscape:window-width="1280" 44.204 + inkscape:window-height="800" 44.205 + inkscape:window-x="0" 44.206 + inkscape:window-y="0" 44.207 + showgrid="false" /> 44.208 + <metadata 44.209 + id="metadata7"> 44.210 + <rdf:RDF> 44.211 + <cc:Work 44.212 + rdf:about=""> 44.213 + <dc:format>image/svg+xml</dc:format> 44.214 + <dc:type 44.215 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 44.216 + </cc:Work> 44.217 + </rdf:RDF> 44.218 + </metadata> 44.219 + <g 44.220 + inkscape:label="Layer 1" 44.221 + inkscape:groupmode="layer" 44.222 + id="layer1"> 44.223 + <rect 44.224 + style="opacity:1;fill:#abadf8;fill-opacity:1;stroke:#595959;stroke-width:0.93760371;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 44.225 + id="rect3180" 44.226 + width="273.81375" 44.227 + height="199.06245" 44.228 + x="369.1796" 44.229 + y="351.79019" /> 44.230 + <rect 44.231 + style="opacity:1;fill:#a2f69c;fill-opacity:1;stroke:#595959;stroke-width:0.93760341;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 44.232 + id="rect3178" 44.233 + width="273.81339" 44.234 + height="199.06233" 44.235 + x="72.699799" 44.236 + y="351.78983" /> 44.237 + <g 44.238 + id="g3144" 44.239 + transform="translate(80.467048,0.71578)"> 44.240 + <g 44.241 + id="g2940"> 44.242 + <rect 44.243 + style="fill:url(#linearGradient3260);fill-opacity:1;stroke:#000000;stroke-width:0.89536202;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 44.244 + id="rect2914" 44.245 + width="227.38896" 44.246 + height="39.500999" 44.247 + x="311.92496" 44.248 + y="395.08627" /> 44.249 + <text 44.250 + xml:space="preserve" 44.251 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 44.252 + x="323.72824" 44.253 + y="416.7626" 44.254 + id="text2918"><tspan 44.255 + sodipodi:role="line" 44.256 + id="tspan2920" 44.257 + x="323.72824" 44.258 + y="416.7626" 44.259 + style="font-family:Courier">.hg/store/data/README.i</tspan></text> 44.260 + </g> 44.261 + <g 44.262 + transform="translate(3.79093e-5,-80.1853)" 44.263 + id="g2945"> 44.264 + <g 44.265 + id="g2955"> 44.266 + <rect 44.267 + y="475.4968" 44.268 + x="15.550935" 44.269 + height="39.500999" 44.270 + width="227.17694" 44.271 + id="rect2947" 44.272 + style="fill:url(#linearGradient3262);fill-opacity:1;stroke:#000000;stroke-width:1.10706258;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 44.273 + <text 44.274 + id="text2949" 44.275 + y="498.35123" 44.276 + x="31.230644" 44.277 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 44.278 + xml:space="preserve"><tspan 44.279 + style="font-family:Courier" 44.280 + y="498.35123" 44.281 + x="31.230644" 44.282 + id="tspan2951" 44.283 + sodipodi:role="line">README</tspan></text> 44.284 + </g> 44.285 + </g> 44.286 + <path 44.287 + inkscape:connector-type="polyline" 44.288 + id="path2960" 44.289 + d="M 242.94685,414.91115 C 242.94685,414.91115 293.61127,415.26754 310.16269,415.38633" 44.290 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.02046943px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 44.291 + sodipodi:nodetypes="cz" /> 44.292 + </g> 44.293 + <g 44.294 + id="g3156" 44.295 + transform="translate(80.467048,0.71578)"> 44.296 + <g 44.297 + transform="translate(116,0)" 44.298 + id="g2831"> 44.299 + <rect 44.300 + style="fill:url(#linearGradient3256);fill-opacity:1;stroke:#000000;stroke-width:1.11001658;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 44.301 + id="rect1906" 44.302 + width="228.18446" 44.303 + height="60.499123" 44.304 + x="195.52719" 44.305 + y="465.51859" /> 44.306 + <g 44.307 + id="g2803" 44.308 + transform="translate(-0.893671,1.833581)"> 44.309 + <text 44.310 + id="text1884" 44.311 + y="483.92801" 44.312 + x="208.95944" 44.313 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 44.314 + xml:space="preserve"><tspan 44.315 + style="font-family:Courier" 44.316 + y="483.92801" 44.317 + x="208.95944" 44.318 + id="tspan1886" 44.319 + sodipodi:role="line">.hg/store/data/src/hello.c.d</tspan></text> 44.320 + <text 44.321 + id="text1888" 44.322 + y="507.79309" 44.323 + x="208.95944" 44.324 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 44.325 + xml:space="preserve"><tspan 44.326 + style="font-family:Courier" 44.327 + y="507.79309" 44.328 + x="208.95944" 44.329 + id="tspan1890" 44.330 + sodipodi:role="line">.hg/store/data/src/hello.c.i</tspan></text> 44.331 + </g> 44.332 + </g> 44.333 + <g 44.334 + id="g2907"> 44.335 + <rect 44.336 + style="fill:url(#linearGradient3258);fill-opacity:1;stroke:#000000;stroke-width:1.10706329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 44.337 + id="rect2843" 44.338 + width="227.17728" 44.339 + height="39.500999" 44.340 + x="15.550805" 44.341 + y="475.4968" /> 44.342 + <text 44.343 + xml:space="preserve" 44.344 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 44.345 + x="31.230644" 44.346 + y="498.35123" 44.347 + id="text2847"><tspan 44.348 + sodipodi:role="line" 44.349 + id="tspan2849" 44.350 + x="31.230644" 44.351 + y="498.35123" 44.352 + style="font-family:Courier">src/hello.c</tspan></text> 44.353 + </g> 44.354 + <path 44.355 + inkscape:connection-end="#g2831" 44.356 + inkscape:connection-start="#g2907" 44.357 + inkscape:connector-type="polyline" 44.358 + id="path2962" 44.359 + d="M 242.4315,495.88043 C 242.4315,495.88043 292.8861,495.99942 310.04102,496.03909" 44.360 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 44.361 + sodipodi:nodetypes="cs" /> 44.362 + </g> 44.363 + <text 44.364 + xml:space="preserve" 44.365 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 44.366 + x="98.496666" 44.367 + y="373.96353" 44.368 + id="text3216"><tspan 44.369 + sodipodi:role="line" 44.370 + id="tspan3218" 44.371 + x="98.496666" 44.372 + y="373.96353">Directorio de trabajo</tspan></text> 44.373 + <text 44.374 + xml:space="preserve" 44.375 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 44.376 + x="391.39197" 44.377 + y="373.96353" 44.378 + id="text3228"><tspan 44.379 + sodipodi:role="line" 44.380 + id="tspan3230" 44.381 + x="391.39197" 44.382 + y="373.96353">Repositorio</tspan></text> 44.383 + </g> 44.384 +</svg>
45.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 45.2 +++ b/es/fixhtml.py Sat Oct 18 07:48:21 2008 -0500 45.3 @@ -0,0 +1,1 @@ 45.4 +../en/fixhtml.py 45.5 \ No newline at end of file
46.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 46.2 +++ b/es/fixsvg Sat Oct 18 07:48:21 2008 -0500 46.3 @@ -0,0 +1,1 @@ 46.4 +../en/fixsvg 46.5 \ No newline at end of file
47.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 47.2 +++ b/es/htlatex.book Sat Oct 18 07:48:21 2008 -0500 47.3 @@ -0,0 +1,1 @@ 47.4 +../en/htlatex.book 47.5 \ No newline at end of file
48.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 48.2 +++ b/es/metadata.svg Sat Oct 18 07:48:21 2008 -0500 48.3 @@ -0,0 +1,337 @@ 48.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 48.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 48.6 +<svg 48.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 48.8 + xmlns:cc="http://creativecommons.org/ns#" 48.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 48.10 + xmlns:svg="http://www.w3.org/2000/svg" 48.11 + xmlns="http://www.w3.org/2000/svg" 48.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 48.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 48.14 + width="744.09448819" 48.15 + height="1052.3622047" 48.16 + id="svg2" 48.17 + sodipodi:version="0.32" 48.18 + inkscape:version="0.46" 48.19 + sodipodi:docname="metadata.svg" 48.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 48.21 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 48.22 + <defs 48.23 + id="defs4"> 48.24 + <inkscape:perspective 48.25 + sodipodi:type="inkscape:persp3d" 48.26 + inkscape:vp_x="0 : 526.18109 : 1" 48.27 + inkscape:vp_y="0 : 1000 : 0" 48.28 + inkscape:vp_z="744.09448 : 526.18109 : 1" 48.29 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 48.30 + id="perspective2479" /> 48.31 + <marker 48.32 + inkscape:stockid="Arrow1Mend" 48.33 + orient="auto" 48.34 + refY="0.0" 48.35 + refX="0.0" 48.36 + id="Arrow1Mend" 48.37 + style="overflow:visible;"> 48.38 + <path 48.39 + id="path2944" 48.40 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 48.41 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 48.42 + transform="scale(0.4) rotate(180) translate(10,0)" /> 48.43 + </marker> 48.44 + </defs> 48.45 + <sodipodi:namedview 48.46 + id="base" 48.47 + pagecolor="#ffffff" 48.48 + bordercolor="#666666" 48.49 + borderopacity="1.0" 48.50 + gridtolerance="10000" 48.51 + guidetolerance="10" 48.52 + objecttolerance="10" 48.53 + inkscape:pageopacity="0.0" 48.54 + inkscape:pageshadow="2" 48.55 + inkscape:zoom="0.98994949" 48.56 + inkscape:cx="232.14286" 48.57 + inkscape:cy="519.03485" 48.58 + inkscape:document-units="px" 48.59 + inkscape:current-layer="layer1" 48.60 + inkscape:window-width="906" 48.61 + inkscape:window-height="659" 48.62 + inkscape:window-x="181" 48.63 + inkscape:window-y="58" 48.64 + showgrid="false" /> 48.65 + <metadata 48.66 + id="metadata7"> 48.67 + <rdf:RDF> 48.68 + <cc:Work 48.69 + rdf:about=""> 48.70 + <dc:format>image/svg+xml</dc:format> 48.71 + <dc:type 48.72 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 48.73 + </cc:Work> 48.74 + </rdf:RDF> 48.75 + </metadata> 48.76 + <g 48.77 + inkscape:label="Layer 1" 48.78 + inkscape:groupmode="layer" 48.79 + id="layer1"> 48.80 + <path 48.81 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 48.82 + d="M 326.94646,467.18359 L 326.94646,510.98123" 48.83 + id="path1910" 48.84 + inkscape:connector-type="polyline" 48.85 + inkscape:connection-end="#rect2962" 48.86 + inkscape:connection-start="#rect2764" /> 48.87 + <path 48.88 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 48.89 + d="M 326.94646,531.98123 L 326.94646,591.77887" 48.90 + id="path1912" 48.91 + inkscape:connector-type="polyline" 48.92 + inkscape:connection-start="#rect2962" 48.93 + inkscape:connection-end="#rect3000" /> 48.94 + <path 48.95 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1;display:inline" 48.96 + d="M 316.1622,531.98123 L 192.30212,652.57648" 48.97 + id="path1916" 48.98 + inkscape:connector-type="polyline" 48.99 + inkscape:connection-end="#rect3038" 48.100 + inkscape:connection-start="#rect2962" /> 48.101 + <path 48.102 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 48.103 + d="M 254.23217,467.18359 L 254.23216,510.98123" 48.104 + id="path3088" 48.105 + inkscape:connector-type="polyline" 48.106 + inkscape:connection-start="#rect1872" 48.107 + inkscape:connection-end="#rect2960" /> 48.108 + <path 48.109 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 48.110 + d="M 254.23215,531.98123 L 254.23215,591.77887" 48.111 + id="path3090" 48.112 + inkscape:connector-type="polyline" 48.113 + inkscape:connection-start="#rect2960" 48.114 + inkscape:connection-end="#rect2998" /> 48.115 + <path 48.116 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#484848;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4.5, 1.5;stroke-dashoffset:0;stroke-opacity:1" 48.117 + d="M 248.84002,531.98123 L 186.90999,652.57648" 48.118 + id="path3092" 48.119 + inkscape:connector-type="polyline" 48.120 + inkscape:connection-start="#rect2960" 48.121 + inkscape:connection-end="#rect3038" /> 48.122 + <rect 48.123 + style="fill:#7b7df5;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.124 + id="rect1872" 48.125 + width="51.42857" 48.126 + height="20" 48.127 + x="228.51788" 48.128 + y="446.68359" /> 48.129 + <rect 48.130 + style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.131 + id="rect2764" 48.132 + width="51.42857" 48.133 + height="20" 48.134 + x="301.23218" 48.135 + y="446.68359" /> 48.136 + <rect 48.137 + style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.138 + id="rect2766" 48.139 + width="51.42857" 48.140 + height="20" 48.141 + x="155.80359" 48.142 + y="446.68359" /> 48.143 + <rect 48.144 + style="fill:#cacbfb;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.145 + id="rect2768" 48.146 + width="51.42857" 48.147 + height="20" 48.148 + x="83.089294" 48.149 + y="446.68359" /> 48.150 + <path 48.151 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.152 + d="M 135.01786,456.68359 L 155.30359,456.68359" 48.153 + id="path2770" 48.154 + inkscape:connector-type="polyline" 48.155 + inkscape:connection-start="#rect2768" 48.156 + inkscape:connection-end="#rect2766" /> 48.157 + <path 48.158 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.159 + d="M 207.73216,456.68359 L 228.01788,456.68359" 48.160 + id="path2772" 48.161 + inkscape:connector-type="polyline" 48.162 + inkscape:connection-start="#rect2766" 48.163 + inkscape:connection-end="#rect1872" /> 48.164 + <path 48.165 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.166 + d="M 280.44645,456.68359 L 300.73218,456.68359" 48.167 + id="path2774" 48.168 + inkscape:connector-type="polyline" 48.169 + inkscape:connection-start="#rect1872" 48.170 + inkscape:connection-end="#rect2764" /> 48.171 + <path 48.172 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 48.173 + d="M 62.303571,456.68359 L 82.589294,456.68359" 48.174 + id="path2778" 48.175 + inkscape:connector-type="polyline" 48.176 + inkscape:connection-end="#rect2768" /> 48.177 + <rect 48.178 + style="fill:#84f57b;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.179 + id="rect2960" 48.180 + width="51.42857" 48.181 + height="20" 48.182 + x="228.51787" 48.183 + y="511.48123" /> 48.184 + <rect 48.185 + style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.186 + id="rect2962" 48.187 + width="51.42857" 48.188 + height="20" 48.189 + x="301.23218" 48.190 + y="511.48123" /> 48.191 + <rect 48.192 + style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.193 + id="rect2964" 48.194 + width="51.42857" 48.195 + height="20" 48.196 + x="155.80357" 48.197 + y="511.48123" /> 48.198 + <rect 48.199 + style="fill:#cefbca;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.200 + id="rect2966" 48.201 + width="51.42857" 48.202 + height="20" 48.203 + x="83.089287" 48.204 + y="511.48123" /> 48.205 + <path 48.206 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.207 + d="M 135.01786,521.48121 L 155.30359,521.48121" 48.208 + id="path2968" 48.209 + inkscape:connector-type="polyline" /> 48.210 + <path 48.211 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.212 + d="M 207.73216,521.48121 L 228.01788,521.48121" 48.213 + id="path2970" 48.214 + inkscape:connector-type="polyline" /> 48.215 + <path 48.216 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.217 + d="M 280.44645,521.48121 L 300.73218,521.48121" 48.218 + id="path2972" 48.219 + inkscape:connector-type="polyline" /> 48.220 + <path 48.221 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 48.222 + d="M 62.30358,521.48121 L 82.5893,521.48121" 48.223 + id="path2974" 48.224 + inkscape:connector-type="polyline" /> 48.225 + <rect 48.226 + style="fill:#f57b8f;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.227 + id="rect2998" 48.228 + width="51.42857" 48.229 + height="20" 48.230 + x="228.51787" 48.231 + y="592.27887" /> 48.232 + <rect 48.233 + style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.234 + id="rect3000" 48.235 + width="51.42857" 48.236 + height="20" 48.237 + x="301.23218" 48.238 + y="592.27887" /> 48.239 + <rect 48.240 + style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.241 + id="rect3002" 48.242 + width="51.42857" 48.243 + height="20" 48.244 + x="155.80357" 48.245 + y="592.27887" /> 48.246 + <rect 48.247 + style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.248 + id="rect3004" 48.249 + width="51.42857" 48.250 + height="20" 48.251 + x="83.089287" 48.252 + y="592.27887" /> 48.253 + <path 48.254 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.255 + d="M 135.01786,602.27884 L 155.30359,602.27884" 48.256 + id="path3006" 48.257 + inkscape:connector-type="polyline" /> 48.258 + <path 48.259 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.260 + d="M 207.73216,602.27884 L 228.01788,602.27884" 48.261 + id="path3008" 48.262 + inkscape:connector-type="polyline" /> 48.263 + <path 48.264 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.265 + d="M 280.44645,602.27884 L 300.73218,602.27884" 48.266 + id="path3010" 48.267 + inkscape:connector-type="polyline" /> 48.268 + <path 48.269 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 48.270 + d="M 62.30358,602.27884 L 82.5893,602.27884" 48.271 + id="path3012" 48.272 + inkscape:connector-type="polyline" /> 48.273 + <rect 48.274 + style="fill:#ffced6;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.275 + id="rect3034" 48.276 + width="51.42857" 48.277 + height="20" 48.278 + x="228.51787" 48.279 + y="653.07648" /> 48.280 + <rect 48.281 + style="fill:#f57b8f;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.282 + id="rect3038" 48.283 + width="51.42857" 48.284 + height="20" 48.285 + x="155.80357" 48.286 + y="653.07648" /> 48.287 + <rect 48.288 + style="fill:#fbcad2;fill-opacity:1;stroke:#595959;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 48.289 + id="rect3040" 48.290 + width="51.42857" 48.291 + height="20" 48.292 + x="83.089287" 48.293 + y="653.07648" /> 48.294 + <path 48.295 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.296 + d="M 135.01786,663.07646 L 155.30359,663.07646" 48.297 + id="path3042" 48.298 + inkscape:connector-type="polyline" /> 48.299 + <path 48.300 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 48.301 + d="M 207.73216,663.07646 L 228.01788,663.07646" 48.302 + id="path3044" 48.303 + inkscape:connector-type="polyline" /> 48.304 + <path 48.305 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#747474;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:3, 3;stroke-dashoffset:0;stroke-opacity:1" 48.306 + d="M 62.30358,663.07646 L 82.5893,663.07646" 48.307 + id="path3048" 48.308 + inkscape:connector-type="polyline" /> 48.309 + <text 48.310 + xml:space="preserve" 48.311 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 48.312 + x="82.072548" 48.313 + y="432.64789" 48.314 + id="text3094"><tspan 48.315 + sodipodi:role="line" 48.316 + id="tspan3096" 48.317 + x="82.072548" 48.318 + y="432.64789">Bitácora de cambios</tspan></text> 48.319 + <text 48.320 + xml:space="preserve" 48.321 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 48.322 + x="82.306923" 48.323 + y="498.97327" 48.324 + id="text3098"><tspan 48.325 + sodipodi:role="line" 48.326 + id="tspan3100" 48.327 + x="82.306923" 48.328 + y="498.97327">Manifiesto</tspan></text> 48.329 + <text 48.330 + xml:space="preserve" 48.331 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 48.332 + x="82.14286" 48.333 + y="580.08569" 48.334 + id="text3102"><tspan 48.335 + sodipodi:role="line" 48.336 + id="tspan3104" 48.337 + x="82.14286" 48.338 + y="580.08569">Bitácora de archivos</tspan></text> 48.339 + </g> 48.340 +</svg>
49.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 49.2 +++ b/es/mq-stack.svg Sat Oct 18 07:48:21 2008 -0500 49.3 @@ -0,0 +1,280 @@ 49.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 49.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 49.6 +<svg 49.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 49.8 + xmlns:cc="http://creativecommons.org/ns#" 49.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 49.10 + xmlns:svg="http://www.w3.org/2000/svg" 49.11 + xmlns="http://www.w3.org/2000/svg" 49.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 49.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 49.14 + width="744.09448819" 49.15 + height="1052.3622047" 49.16 + id="svg2" 49.17 + sodipodi:version="0.32" 49.18 + inkscape:version="0.46" 49.19 + sodipodi:docname="mq-stack.svg" 49.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 49.21 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 49.22 + <defs 49.23 + id="defs4"> 49.24 + <inkscape:perspective 49.25 + sodipodi:type="inkscape:persp3d" 49.26 + inkscape:vp_x="0 : 526.18109 : 1" 49.27 + inkscape:vp_y="0 : 1000 : 0" 49.28 + inkscape:vp_z="744.09448 : 526.18109 : 1" 49.29 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 49.30 + id="perspective2525" /> 49.31 + </defs> 49.32 + <sodipodi:namedview 49.33 + id="base" 49.34 + pagecolor="#ffffff" 49.35 + bordercolor="#666666" 49.36 + borderopacity="1.0" 49.37 + inkscape:pageopacity="0.0" 49.38 + inkscape:pageshadow="2" 49.39 + inkscape:zoom="1.4142136" 49.40 + inkscape:cx="299.33323" 49.41 + inkscape:cy="815.646" 49.42 + inkscape:document-units="px" 49.43 + inkscape:current-layer="layer1" 49.44 + inkscape:window-width="1014" 49.45 + inkscape:window-height="689" 49.46 + inkscape:window-x="89" 49.47 + inkscape:window-y="25" 49.48 + showgrid="false" /> 49.49 + <metadata 49.50 + id="metadata7"> 49.51 + <rdf:RDF> 49.52 + <cc:Work 49.53 + rdf:about=""> 49.54 + <dc:format>image/svg+xml</dc:format> 49.55 + <dc:type 49.56 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 49.57 + </cc:Work> 49.58 + </rdf:RDF> 49.59 + </metadata> 49.60 + <g 49.61 + inkscape:label="Layer 1" 49.62 + inkscape:groupmode="layer" 49.63 + id="layer1"> 49.64 + <rect 49.65 + style="fill:#0000ff;fill-opacity:0.75;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 49.66 + id="rect1307" 49.67 + width="202.93683" 49.68 + height="24.243662" 49.69 + x="230.01944" 49.70 + y="221.70146" /> 49.71 + <text 49.72 + xml:space="preserve" 49.73 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.74 + x="237.89606" 49.75 + y="237.13383" 49.76 + id="text1309"><tspan 49.77 + sodipodi:role="line" 49.78 + id="tspan1311" 49.79 + x="237.89606" 49.80 + y="237.13383">prevent-compiler-reorder.patch</tspan></text> 49.81 + <rect 49.82 + style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 49.83 + id="rect1320" 49.84 + width="202.93683" 49.85 + height="24.243662" 49.86 + x="230.01936" 49.87 + y="251.34325" /> 49.88 + <text 49.89 + xml:space="preserve" 49.90 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.91 + x="237.89598" 49.92 + y="266.77563" 49.93 + id="text1322"><tspan 49.94 + sodipodi:role="line" 49.95 + id="tspan1324" 49.96 + x="237.89598" 49.97 + y="266.77563">namespace-cleanup.patch</tspan></text> 49.98 + <rect 49.99 + style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 49.100 + id="rect2217" 49.101 + width="202.93683" 49.102 + height="24.243662" 49.103 + x="230.01936" 49.104 + y="280.98505" /> 49.105 + <text 49.106 + xml:space="preserve" 49.107 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.108 + x="237.89598" 49.109 + y="296.41742" 49.110 + id="text2219"><tspan 49.111 + sodipodi:role="line" 49.112 + id="tspan2221" 49.113 + x="237.89598" 49.114 + y="296.41742">powerpc-port-fixes.patch</tspan></text> 49.115 + <rect 49.116 + style="fill:#7979ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#3c3c3c;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 49.117 + id="rect3114" 49.118 + width="202.93683" 49.119 + height="24.243662" 49.120 + x="230.01936" 49.121 + y="310.6268" /> 49.122 + <text 49.123 + xml:space="preserve" 49.124 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.125 + x="237.89598" 49.126 + y="326.05917" 49.127 + id="text3116"><tspan 49.128 + sodipodi:role="line" 49.129 + id="tspan3118" 49.130 + x="237.89598" 49.131 + y="326.05917">report-devinfo-correctly.patch</tspan></text> 49.132 + <text 49.133 + xml:space="preserve" 49.134 + style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.135 + x="200.01021" 49.136 + y="191.68094" 49.137 + id="text3170" 49.138 + sodipodi:linespacing="125%"><tspan 49.139 + sodipodi:role="line" 49.140 + id="tspan3172" 49.141 + x="200.01021" 49.142 + y="191.68094" 49.143 + style="font-size:48px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">{</tspan></text> 49.144 + <text 49.145 + xml:space="preserve" 49.146 + style="font-size:15.25329685px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.147 + x="255.26627" 49.148 + y="248.79449" 49.149 + id="text3190" 49.150 + sodipodi:linespacing="125%" 49.151 + transform="scale(0.786716,1.271107)"><tspan 49.152 + sodipodi:role="line" 49.153 + id="tspan3192" 49.154 + x="255.26627" 49.155 + y="248.79449" 49.156 + style="font-size:61.01318741px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans">{</tspan></text> 49.157 + <text 49.158 + xml:space="preserve" 49.159 + style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.160 + x="195.86807" 49.161 + y="173.17117" 49.162 + id="text4085" 49.163 + sodipodi:linespacing="125%"><tspan 49.164 + sodipodi:role="line" 49.165 + id="tspan4087" 49.166 + x="195.86807" 49.167 + y="173.17117" 49.168 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">presente en la serie,</tspan><tspan 49.169 + sodipodi:role="line" 49.170 + x="195.86807" 49.171 + y="188.17117" 49.172 + id="tspan4089" 49.173 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">pero no aplicado</tspan></text> 49.174 + <text 49.175 + xml:space="preserve" 49.176 + style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.177 + x="195.0712" 49.178 + y="288.91745" 49.179 + id="text4091" 49.180 + sodipodi:linespacing="125%"><tspan 49.181 + sodipodi:role="line" 49.182 + id="tspan4093" 49.183 + x="195.0712" 49.184 + y="288.91745" 49.185 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">parches aplicados,</tspan><tspan 49.186 + sodipodi:role="line" 49.187 + x="195.0712" 49.188 + y="303.91745" 49.189 + id="tspan4111" 49.190 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">Conjuntos de cambios presentes</tspan></text> 49.191 + <text 49.192 + xml:space="preserve" 49.193 + style="font-size:12px;font-style:normal;font-weight:normal;line-height:125%;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.194 + x="195.0712" 49.195 + y="229.28813" 49.196 + id="text4095" 49.197 + sodipodi:linespacing="125%"><tspan 49.198 + sodipodi:role="line" 49.199 + id="tspan4097" 49.200 + x="195.0712" 49.201 + y="229.28813" 49.202 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">parche aplicado</tspan><tspan 49.203 + sodipodi:role="line" 49.204 + x="195.0712" 49.205 + y="244.28813" 49.206 + id="tspan4109" 49.207 + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;writing-mode:lr-tb;text-anchor:end;font-family:Bitstream Vera Sans">más recientemente</tspan></text> 49.208 + <text 49.209 + xml:space="preserve" 49.210 + style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.211 + x="450.4975" 49.212 + y="238.29692" 49.213 + id="text4137"><tspan 49.214 + sodipodi:role="line" 49.215 + id="tspan4139" 49.216 + x="450.4975" 49.217 + y="238.29692">201ad3209902</tspan></text> 49.218 + <text 49.219 + xml:space="preserve" 49.220 + style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.221 + x="450.05804" 49.222 + y="267.93872" 49.223 + id="text4141"><tspan 49.224 + sodipodi:role="line" 49.225 + id="tspan4143" 49.226 + x="450.05804" 49.227 + y="267.93872">126b84e593ae</tspan></text> 49.228 + <text 49.229 + xml:space="preserve" 49.230 + style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.231 + x="450.6557" 49.232 + y="297.58051" 49.233 + id="text4145"><tspan 49.234 + sodipodi:role="line" 49.235 + id="tspan4147" 49.236 + x="450.6557" 49.237 + y="297.58051">a655daf15409</tspan></text> 49.238 + <text 49.239 + xml:space="preserve" 49.240 + style="font-size:12px;font-style:normal;font-weight:normal;opacity:1;fill:#989898;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.241 + x="450.71429" 49.242 + y="327.22226" 49.243 + id="text4149"><tspan 49.244 + sodipodi:role="line" 49.245 + id="tspan4151" 49.246 + x="450.71429" 49.247 + y="327.22226">e50d59aaea3a</tspan></text> 49.248 + <rect 49.249 + style="fill:#d7d7ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#a6a6a6;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 49.250 + id="rect3106" 49.251 + width="202.93683" 49.252 + height="24.243662" 49.253 + x="230.01936" 49.254 + y="150.41792" /> 49.255 + <text 49.256 + xml:space="preserve" 49.257 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.258 + x="237.89598" 49.259 + y="165.8503" 49.260 + id="text3108"><tspan 49.261 + sodipodi:role="line" 49.262 + id="tspan3110" 49.263 + x="237.89598" 49.264 + y="165.8503">forbid-illegal-params.patch</tspan></text> 49.265 + <rect 49.266 + style="fill:#d7d7ff;fill-opacity:0.875;fill-rule:evenodd;stroke:#a6a6a6;stroke-width:1.05063355px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 49.267 + id="rect2241" 49.268 + width="202.93683" 49.269 + height="24.243662" 49.270 + x="230.16466" 49.271 + y="180.05968" /> 49.272 + <text 49.273 + xml:space="preserve" 49.274 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" 49.275 + x="238.04128" 49.276 + y="195.49205" 49.277 + id="text2243"><tspan 49.278 + sodipodi:role="line" 49.279 + id="tspan2245" 49.280 + x="238.04128" 49.281 + y="195.49205">fix-memory-leak.patch</tspan></text> 49.282 + </g> 49.283 +</svg>
50.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 50.2 +++ b/es/revlog.svg Sat Oct 18 07:48:21 2008 -0500 50.3 @@ -0,0 +1,1164 @@ 50.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 50.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 50.6 +<svg 50.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 50.8 + xmlns:cc="http://creativecommons.org/ns#" 50.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 50.10 + xmlns:svg="http://www.w3.org/2000/svg" 50.11 + xmlns="http://www.w3.org/2000/svg" 50.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 50.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 50.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 50.15 + width="744.09448819" 50.16 + height="1052.3622047" 50.17 + id="svg2" 50.18 + sodipodi:version="0.32" 50.19 + inkscape:version="0.46" 50.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 50.21 + sodipodi:docname="revlog.svg" 50.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 50.23 + <defs 50.24 + id="defs4"> 50.25 + <inkscape:perspective 50.26 + sodipodi:type="inkscape:persp3d" 50.27 + inkscape:vp_x="0 : 526.18109 : 1" 50.28 + inkscape:vp_y="0 : 1000 : 0" 50.29 + inkscape:vp_z="744.09448 : 526.18109 : 1" 50.30 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 50.31 + id="perspective2726" /> 50.32 + <marker 50.33 + inkscape:stockid="Arrow1Mend" 50.34 + orient="auto" 50.35 + refY="0.0" 50.36 + refX="0.0" 50.37 + id="Arrow1Mend" 50.38 + style="overflow:visible;"> 50.39 + <path 50.40 + id="path4852" 50.41 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 50.42 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 50.43 + transform="scale(0.4) rotate(180) translate(10,0)" /> 50.44 + </marker> 50.45 + <linearGradient 50.46 + id="linearGradient3092"> 50.47 + <stop 50.48 + style="stop-color:#44436f;stop-opacity:1;" 50.49 + offset="0" 50.50 + id="stop3094" /> 50.51 + <stop 50.52 + style="stop-color:#abade5;stop-opacity:1;" 50.53 + offset="1" 50.54 + id="stop3096" /> 50.55 + </linearGradient> 50.56 + <linearGradient 50.57 + inkscape:collect="always" 50.58 + xlink:href="#linearGradient3092" 50.59 + id="linearGradient3118" 50.60 + gradientUnits="userSpaceOnUse" 50.61 + x1="176.16635" 50.62 + y1="405.21934" 50.63 + x2="417.11935" 50.64 + y2="405.21934" /> 50.65 + <linearGradient 50.66 + inkscape:collect="always" 50.67 + xlink:href="#linearGradient3092" 50.68 + id="linearGradient3120" 50.69 + gradientUnits="userSpaceOnUse" 50.70 + x1="176.16635" 50.71 + y1="405.21934" 50.72 + x2="417.11935" 50.73 + y2="405.21934" /> 50.74 + <linearGradient 50.75 + inkscape:collect="always" 50.76 + xlink:href="#linearGradient3092" 50.77 + id="linearGradient3129" 50.78 + gradientUnits="userSpaceOnUse" 50.79 + x1="176.16635" 50.80 + y1="405.21934" 50.81 + x2="417.11935" 50.82 + y2="405.21934" 50.83 + gradientTransform="translate(-0.928574,-1.428574)" /> 50.84 + <linearGradient 50.85 + inkscape:collect="always" 50.86 + xlink:href="#linearGradient3092" 50.87 + id="linearGradient3133" 50.88 + gradientUnits="userSpaceOnUse" 50.89 + x1="176.16635" 50.90 + y1="405.21934" 50.91 + x2="417.11935" 50.92 + y2="405.21934" 50.93 + gradientTransform="translate(-0.928574,-1.428574)" /> 50.94 + <linearGradient 50.95 + inkscape:collect="always" 50.96 + xlink:href="#linearGradient3092" 50.97 + id="linearGradient3708" 50.98 + gradientUnits="userSpaceOnUse" 50.99 + gradientTransform="matrix(0.423343,0,0,0.423343,138.874,-67.01732)" 50.100 + x1="175.23776" 50.101 + y1="509.98154" 50.102 + x2="416.29077" 50.103 + y2="297.49997" /> 50.104 + <linearGradient 50.105 + inkscape:collect="always" 50.106 + xlink:href="#linearGradient3092" 50.107 + id="linearGradient5164" 50.108 + gradientUnits="userSpaceOnUse" 50.109 + gradientTransform="matrix(0.423343,0,0,0.423343,198.249,247.4358)" 50.110 + x1="175.23776" 50.111 + y1="509.98154" 50.112 + x2="416.29077" 50.113 + y2="297.49997" /> 50.114 + <linearGradient 50.115 + inkscape:collect="always" 50.116 + xlink:href="#linearGradient3092" 50.117 + id="linearGradient5584" 50.118 + gradientUnits="userSpaceOnUse" 50.119 + gradientTransform="matrix(0.423343,0,0,0.423343,143.9081,371.2915)" 50.120 + x1="175.23776" 50.121 + y1="509.98154" 50.122 + x2="416.29077" 50.123 + y2="297.49997" /> 50.124 + <linearGradient 50.125 + inkscape:collect="always" 50.126 + xlink:href="#linearGradient3092" 50.127 + id="linearGradient5784" 50.128 + gradientUnits="userSpaceOnUse" 50.129 + gradientTransform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 50.130 + x1="175.23776" 50.131 + y1="509.98154" 50.132 + x2="416.29077" 50.133 + y2="297.49997" /> 50.134 + <linearGradient 50.135 + inkscape:collect="always" 50.136 + xlink:href="#linearGradient3092" 50.137 + id="linearGradient5786" 50.138 + gradientUnits="userSpaceOnUse" 50.139 + gradientTransform="matrix(0.423343,0,0,0.423343,198.249,152.137)" 50.140 + x1="175.23776" 50.141 + y1="509.98154" 50.142 + x2="416.29077" 50.143 + y2="297.49997" /> 50.144 + <linearGradient 50.145 + inkscape:collect="always" 50.146 + xlink:href="#linearGradient3092" 50.147 + id="linearGradient5895" 50.148 + gradientUnits="userSpaceOnUse" 50.149 + gradientTransform="matrix(0.423343,0,0,0.423343,198.0215,261.7142)" 50.150 + x1="175.23776" 50.151 + y1="509.98154" 50.152 + x2="416.29077" 50.153 + y2="297.49997" /> 50.154 + <linearGradient 50.155 + inkscape:collect="always" 50.156 + xlink:href="#linearGradient3092" 50.157 + id="linearGradient5958" 50.158 + gradientUnits="userSpaceOnUse" 50.159 + gradientTransform="matrix(0.423343,0,0,0.423343,137.1978,42.55987)" 50.160 + x1="175.23776" 50.161 + y1="509.98154" 50.162 + x2="416.29077" 50.163 + y2="297.49997" /> 50.164 + </defs> 50.165 + <sodipodi:namedview 50.166 + id="base" 50.167 + pagecolor="#ffffff" 50.168 + bordercolor="#666666" 50.169 + borderopacity="1.0" 50.170 + gridtolerance="10000" 50.171 + guidetolerance="10" 50.172 + objecttolerance="10" 50.173 + inkscape:pageopacity="0.0" 50.174 + inkscape:pageshadow="2" 50.175 + inkscape:zoom="1.8101934" 50.176 + inkscape:cx="199.78816" 50.177 + inkscape:cy="863.27363" 50.178 + inkscape:document-units="px" 50.179 + inkscape:current-layer="layer1" 50.180 + inkscape:window-width="906" 50.181 + inkscape:window-height="659" 50.182 + inkscape:window-x="29" 50.183 + inkscape:window-y="79" 50.184 + inkscape:connector-spacing="11" 50.185 + showgrid="false" /> 50.186 + <metadata 50.187 + id="metadata7"> 50.188 + <rdf:RDF> 50.189 + <cc:Work 50.190 + rdf:about=""> 50.191 + <dc:format>image/svg+xml</dc:format> 50.192 + <dc:type 50.193 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 50.194 + </cc:Work> 50.195 + </rdf:RDF> 50.196 + </metadata> 50.197 + <g 50.198 + inkscape:label="Layer 1" 50.199 + inkscape:groupmode="layer" 50.200 + id="layer1"> 50.201 + <rect 50.202 + y="168.74846" 50.203 + x="211.58516" 50.204 + height="89.506805" 50.205 + width="101.60232" 50.206 + id="rect3068" 50.207 + style="fill:url(#linearGradient5958);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.208 + <g 50.209 + id="g3215" 50.210 + transform="matrix(0.423343,0,0,0.423343,137.1977,42.55985)"> 50.211 + <rect 50.212 + y="447.71451" 50.213 + x="299.67859" 50.214 + height="48.571426" 50.215 + width="103.14286" 50.216 + id="rect2899" 50.217 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.218 + <text 50.219 + id="text2903" 50.220 + y="464.8139" 50.221 + x="308.89639" 50.222 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.223 + xml:space="preserve"><tspan 50.224 + y="464.8139" 50.225 + x="308.89639" 50.226 + sodipodi:role="line" 50.227 + id="tspan2905">Segundo padre</tspan></text> 50.228 + <text 50.229 + id="text2907" 50.230 + y="485.50256" 50.231 + x="308.20175" 50.232 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.233 + xml:space="preserve"><tspan 50.234 + style="font-family:Courier" 50.235 + y="485.50256" 50.236 + x="308.20175" 50.237 + id="tspan2909" 50.238 + sodipodi:role="line">32bf9a5f22c0</tspan></text> 50.239 + </g> 50.240 + <g 50.241 + id="g3250" 50.242 + transform="matrix(0.423343,0,0,0.423343,137.1977,42.55986)"> 50.243 + <rect 50.244 + y="311.28598" 50.245 + x="188.6071" 50.246 + height="48.571426" 50.247 + width="103.14286" 50.248 + id="rect2936" 50.249 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.250 + <text 50.251 + id="text2940" 50.252 + y="328.38538" 50.253 + x="197.82495" 50.254 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.255 + xml:space="preserve"><tspan 50.256 + y="328.38538" 50.257 + x="197.82495" 50.258 + sodipodi:role="line" 50.259 + id="tspan2942">Hash de revisión</tspan></text> 50.260 + <text 50.261 + id="text2944" 50.262 + y="349.07404" 50.263 + x="197.13031" 50.264 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.265 + xml:space="preserve"><tspan 50.266 + style="font-family:Courier" 50.267 + y="349.07404" 50.268 + x="197.13031" 50.269 + id="tspan2946" 50.270 + sodipodi:role="line">34b8b7a15ea1</tspan></text> 50.271 + </g> 50.272 + <g 50.273 + id="g3243" 50.274 + transform="matrix(0.423343,0,0,0.423343,137.6664,43.91853)"> 50.275 + <rect 50.276 + y="363.07654" 50.277 + x="187.5" 50.278 + height="75" 50.279 + width="213.85715" 50.280 + id="rect2950" 50.281 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.282 + <text 50.283 + id="text2958" 50.284 + y="400.86459" 50.285 + x="196.02321" 50.286 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.287 + xml:space="preserve"><tspan 50.288 + style="fill:black;fill-opacity:1;font-family:Courier" 50.289 + y="400.86459" 50.290 + x="196.02321" 50.291 + id="tspan2960" 50.292 + sodipodi:role="line">...</tspan></text> 50.293 + <text 50.294 + id="text2954" 50.295 + y="380.17593" 50.296 + x="196.71785" 50.297 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.298 + xml:space="preserve"><tspan 50.299 + y="380.17593" 50.300 + x="196.71785" 50.301 + sodipodi:role="line" 50.302 + id="tspan2956" 50.303 + style="fill:#000000;fill-opacity:1">Datos de Revisión (delta o snapshot)</tspan></text> 50.304 + </g> 50.305 + <g 50.306 + id="g5529" 50.307 + transform="translate(-6.710312,-8.165836e-6)"> 50.308 + <rect 50.309 + style="fill:url(#linearGradient5584);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.310 + id="rect3509" 50.311 + width="101.60232" 50.312 + height="89.506805" 50.313 + x="218.29547" 50.314 + y="497.4801" /> 50.315 + <g 50.316 + transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 50.317 + id="g3513"> 50.318 + <g 50.319 + id="g3515"> 50.320 + <rect 50.321 + y="447.72418" 50.322 + x="188.6071" 50.323 + height="48.571426" 50.324 + width="103.14286" 50.325 + id="rect3517" 50.326 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.327 + <text 50.328 + id="text3519" 50.329 + y="464.82358" 50.330 + x="197.82495" 50.331 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.332 + xml:space="preserve"><tspan 50.333 + y="464.82358" 50.334 + x="197.82495" 50.335 + sodipodi:role="line" 50.336 + id="tspan3521">Primer padre</tspan></text> 50.337 + <text 50.338 + id="text3523" 50.339 + y="485.51224" 50.340 + x="197.13031" 50.341 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.342 + xml:space="preserve"><tspan 50.343 + style="font-family:Courier" 50.344 + y="485.51224" 50.345 + x="197.13031" 50.346 + id="tspan3525" 50.347 + sodipodi:role="line">000000000000</tspan></text> 50.348 + </g> 50.349 + <g 50.350 + id="g3527"> 50.351 + <rect 50.352 + y="447.71451" 50.353 + x="299.67859" 50.354 + height="48.571426" 50.355 + width="103.14286" 50.356 + id="rect3529" 50.357 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.358 + <text 50.359 + id="text3531" 50.360 + y="464.8139" 50.361 + x="308.89639" 50.362 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.363 + xml:space="preserve"><tspan 50.364 + y="464.8139" 50.365 + x="308.89639" 50.366 + sodipodi:role="line" 50.367 + id="tspan3533">Segundo padre</tspan></text> 50.368 + <text 50.369 + id="text3535" 50.370 + y="485.50256" 50.371 + x="308.20175" 50.372 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.373 + xml:space="preserve"><tspan 50.374 + style="font-family:Courier" 50.375 + y="485.50256" 50.376 + x="308.20175" 50.377 + id="tspan3537" 50.378 + sodipodi:role="line">000000000000</tspan></text> 50.379 + </g> 50.380 + </g> 50.381 + <g 50.382 + transform="matrix(0.423343,0,0,0.423343,143.908,371.2915)" 50.383 + id="g3539"> 50.384 + <rect 50.385 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.386 + id="rect3541" 50.387 + width="103.14286" 50.388 + height="48.571426" 50.389 + x="188.6071" 50.390 + y="311.28598" /> 50.391 + <text 50.392 + xml:space="preserve" 50.393 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.394 + x="197.82495" 50.395 + y="328.38538" 50.396 + id="text3543"><tspan 50.397 + id="tspan3545" 50.398 + sodipodi:role="line" 50.399 + x="197.82495" 50.400 + y="328.38538">Hash de revisión</tspan></text> 50.401 + <text 50.402 + xml:space="preserve" 50.403 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.404 + x="197.13031" 50.405 + y="349.07404" 50.406 + id="text3547"><tspan 50.407 + sodipodi:role="line" 50.408 + id="tspan3549" 50.409 + x="197.13031" 50.410 + y="349.07404" 50.411 + style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 50.412 + </g> 50.413 + <g 50.414 + transform="matrix(0.423343,0,0,0.423343,144.3767,372.6502)" 50.415 + id="g3551"> 50.416 + <rect 50.417 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.418 + id="rect3553" 50.419 + width="213.85715" 50.420 + height="75" 50.421 + x="187.5" 50.422 + y="363.07654" /> 50.423 + <text 50.424 + xml:space="preserve" 50.425 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.426 + x="196.02321" 50.427 + y="400.86459" 50.428 + id="text3555"><tspan 50.429 + sodipodi:role="line" 50.430 + id="tspan3557" 50.431 + x="196.02321" 50.432 + y="400.86459" 50.433 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 50.434 + <text 50.435 + xml:space="preserve" 50.436 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.437 + x="196.71785" 50.438 + y="380.17593" 50.439 + id="text3559"><tspan 50.440 + style="fill:#000000;fill-opacity:1" 50.441 + id="tspan3561" 50.442 + sodipodi:role="line" 50.443 + x="196.71785" 50.444 + y="380.17593">Datos de revisión (delta o snapshot)</tspan></text> 50.445 + </g> 50.446 + </g> 50.447 + <g 50.448 + id="g4868" 50.449 + transform="translate(-1.676208,-2.342463e-5)"> 50.450 + <rect 50.451 + style="fill:url(#linearGradient3708);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.452 + id="rect3567" 50.453 + width="101.60232" 50.454 + height="89.506805" 50.455 + x="213.26137" 50.456 + y="59.171272" /> 50.457 + <g 50.458 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 50.459 + id="g3573"> 50.460 + <rect 50.461 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.462 + id="rect3575" 50.463 + width="103.14286" 50.464 + height="48.571426" 50.465 + x="188.6071" 50.466 + y="447.72418" /> 50.467 + <text 50.468 + xml:space="preserve" 50.469 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.470 + x="197.82495" 50.471 + y="464.82358" 50.472 + id="text3577"><tspan 50.473 + id="tspan3579" 50.474 + sodipodi:role="line" 50.475 + x="197.82495" 50.476 + y="464.82358">Primer padre</tspan></text> 50.477 + <text 50.478 + xml:space="preserve" 50.479 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.480 + x="197.13031" 50.481 + y="485.51224" 50.482 + id="text3581"><tspan 50.483 + sodipodi:role="line" 50.484 + id="tspan3583" 50.485 + x="197.13031" 50.486 + y="485.51224" 50.487 + style="font-family:Courier">34b8b7a15ea1</tspan></text> 50.488 + </g> 50.489 + <g 50.490 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01734)" 50.491 + id="g3585"> 50.492 + <rect 50.493 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.494 + id="rect3587" 50.495 + width="103.14286" 50.496 + height="48.571426" 50.497 + x="299.67859" 50.498 + y="447.71451" /> 50.499 + <text 50.500 + xml:space="preserve" 50.501 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.502 + x="308.89639" 50.503 + y="464.8139" 50.504 + id="text3589"><tspan 50.505 + id="tspan3591" 50.506 + sodipodi:role="line" 50.507 + x="308.89639" 50.508 + y="464.8139">Segundo padre</tspan></text> 50.509 + <text 50.510 + xml:space="preserve" 50.511 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.512 + x="308.20175" 50.513 + y="485.50256" 50.514 + id="text3593"><tspan 50.515 + sodipodi:role="line" 50.516 + id="tspan3595" 50.517 + x="308.20175" 50.518 + y="485.50256" 50.519 + style="font-family:Courier">000000000000</tspan></text> 50.520 + </g> 50.521 + <g 50.522 + transform="matrix(0.423343,0,0,0.423343,138.8739,-67.01733)" 50.523 + id="g3597"> 50.524 + <rect 50.525 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.526 + id="rect3599" 50.527 + width="103.14286" 50.528 + height="48.571426" 50.529 + x="188.6071" 50.530 + y="311.28598" /> 50.531 + <text 50.532 + xml:space="preserve" 50.533 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.534 + x="197.82495" 50.535 + y="328.38538" 50.536 + id="text3601"><tspan 50.537 + id="tspan3603" 50.538 + sodipodi:role="line" 50.539 + x="197.82495" 50.540 + y="328.38538">Hash de revisión</tspan></text> 50.541 + <text 50.542 + xml:space="preserve" 50.543 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.544 + x="197.13031" 50.545 + y="349.07404" 50.546 + id="text3605"><tspan 50.547 + sodipodi:role="line" 50.548 + id="tspan3607" 50.549 + x="197.13031" 50.550 + y="349.07404" 50.551 + style="font-family:Courier">1b67dc96f27a</tspan></text> 50.552 + </g> 50.553 + <g 50.554 + transform="matrix(0.423343,0,0,0.423343,139.3426,-65.65866)" 50.555 + id="g3609"> 50.556 + <rect 50.557 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.558 + id="rect3611" 50.559 + width="213.85715" 50.560 + height="75" 50.561 + x="187.5" 50.562 + y="363.07654" /> 50.563 + <text 50.564 + xml:space="preserve" 50.565 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.566 + x="196.02321" 50.567 + y="400.86459" 50.568 + id="text3613"><tspan 50.569 + sodipodi:role="line" 50.570 + id="tspan3615" 50.571 + x="196.02321" 50.572 + y="400.86459" 50.573 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 50.574 + <text 50.575 + xml:space="preserve" 50.576 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.577 + x="196.71785" 50.578 + y="380.17593" 50.579 + id="text3617"><tspan 50.580 + style="fill:#000000;fill-opacity:1" 50.581 + id="tspan3619" 50.582 + sodipodi:role="line" 50.583 + x="196.71785" 50.584 + y="380.17593">Datos de revisión (delta o snapshot)</tspan></text> 50.585 + </g> 50.586 + </g> 50.587 + <path 50.588 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:none;marker-end:url(#Arrow1Mend)" 50.589 + d="M 240.78255,143.08593 L 241.42595,171.75349" 50.590 + id="path3801" 50.591 + inkscape:connector-type="polyline" 50.592 + inkscape:connection-start="#g3573" 50.593 + inkscape:connection-end="#g3250" /> 50.594 + <g 50.595 + id="g5677"> 50.596 + <rect 50.597 + style="fill:url(#linearGradient5784);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.598 + id="rect3393" 50.599 + width="101.60232" 50.600 + height="89.506805" 50.601 + x="150.76137" 50.602 + y="278.32565" /> 50.603 + <g 50.604 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 50.605 + id="g3399"> 50.606 + <rect 50.607 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.608 + id="rect3401" 50.609 + width="103.14286" 50.610 + height="48.571426" 50.611 + x="188.6071" 50.612 + y="447.72418" /> 50.613 + <text 50.614 + xml:space="preserve" 50.615 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.616 + x="197.82495" 50.617 + y="464.82358" 50.618 + id="text3403"><tspan 50.619 + id="tspan3405" 50.620 + sodipodi:role="line" 50.621 + x="197.82495" 50.622 + y="464.82358">Primer padre</tspan></text> 50.623 + <text 50.624 + xml:space="preserve" 50.625 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.626 + x="197.13031" 50.627 + y="485.51224" 50.628 + id="text3407"><tspan 50.629 + sodipodi:role="line" 50.630 + id="tspan3409" 50.631 + x="197.13031" 50.632 + y="485.51224" 50.633 + style="font-family:Courier">ff9dc8bc2a8b</tspan></text> 50.634 + </g> 50.635 + <g 50.636 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 50.637 + id="g3411"> 50.638 + <rect 50.639 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.640 + id="rect3413" 50.641 + width="103.14286" 50.642 + height="48.571426" 50.643 + x="299.67859" 50.644 + y="447.71451" /> 50.645 + <text 50.646 + xml:space="preserve" 50.647 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.648 + x="308.89639" 50.649 + y="464.8139" 50.650 + id="text3415"><tspan 50.651 + id="tspan3417" 50.652 + sodipodi:role="line" 50.653 + x="308.89639" 50.654 + y="464.8139">Segundo padre</tspan></text> 50.655 + <text 50.656 + xml:space="preserve" 50.657 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.658 + x="308.20175" 50.659 + y="485.50256" 50.660 + id="text3419"><tspan 50.661 + sodipodi:role="line" 50.662 + id="tspan3421" 50.663 + x="308.20175" 50.664 + y="485.50256" 50.665 + style="font-family:Courier">000000000000</tspan></text> 50.666 + </g> 50.667 + <g 50.668 + transform="matrix(0.423343,0,0,0.423343,76.37397,152.137)" 50.669 + id="g3423"> 50.670 + <rect 50.671 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.672 + id="rect3425" 50.673 + width="103.14286" 50.674 + height="48.571426" 50.675 + x="188.6071" 50.676 + y="311.28598" /> 50.677 + <text 50.678 + xml:space="preserve" 50.679 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.680 + x="197.82495" 50.681 + y="328.38538" 50.682 + id="text3427"><tspan 50.683 + id="tspan3429" 50.684 + sodipodi:role="line" 50.685 + x="197.82495" 50.686 + y="328.38538">Hash de revisión</tspan></text> 50.687 + <text 50.688 + xml:space="preserve" 50.689 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.690 + x="197.13031" 50.691 + y="349.07404" 50.692 + id="text3431"><tspan 50.693 + sodipodi:role="line" 50.694 + id="tspan3433" 50.695 + x="197.13031" 50.696 + y="349.07404" 50.697 + style="font-family:Courier">5b80c922ebdd</tspan></text> 50.698 + </g> 50.699 + <g 50.700 + transform="matrix(0.423343,0,0,0.423343,76.84265,153.4957)" 50.701 + id="g3435"> 50.702 + <rect 50.703 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.704 + id="rect3437" 50.705 + width="213.85715" 50.706 + height="75" 50.707 + x="187.5" 50.708 + y="363.07654" /> 50.709 + <text 50.710 + xml:space="preserve" 50.711 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.712 + x="196.02321" 50.713 + y="400.86459" 50.714 + id="text3439"><tspan 50.715 + sodipodi:role="line" 50.716 + id="tspan3441" 50.717 + x="196.02321" 50.718 + y="400.86459" 50.719 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 50.720 + <text 50.721 + xml:space="preserve" 50.722 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.723 + x="196.71785" 50.724 + y="380.17593" 50.725 + id="text3443"><tspan 50.726 + style="fill:#000000;fill-opacity:1" 50.727 + id="tspan3445" 50.728 + sodipodi:role="line" 50.729 + x="196.71785" 50.730 + y="380.17593">Datos de revisión (delta o snapshot)</tspan></text> 50.731 + </g> 50.732 + </g> 50.733 + <g 50.734 + id="g5646" 50.735 + transform="translate(-0.227432,0)"> 50.736 + <rect 50.737 + style="fill:url(#linearGradient5786);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.738 + id="rect3451" 50.739 + width="101.60232" 50.740 + height="89.506805" 50.741 + x="272.63638" 50.742 + y="278.32565" /> 50.743 + <g 50.744 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 50.745 + id="g3457"> 50.746 + <rect 50.747 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.748 + id="rect3459" 50.749 + width="103.14286" 50.750 + height="48.571426" 50.751 + x="188.6071" 50.752 + y="447.72418" /> 50.753 + <text 50.754 + xml:space="preserve" 50.755 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.756 + x="197.82495" 50.757 + y="464.82358" 50.758 + id="text3461"><tspan 50.759 + id="tspan3463" 50.760 + sodipodi:role="line" 50.761 + x="197.82495" 50.762 + y="464.82358">Primer padre</tspan></text> 50.763 + <text 50.764 + xml:space="preserve" 50.765 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.766 + x="197.13031" 50.767 + y="485.51224" 50.768 + id="text3465"><tspan 50.769 + sodipodi:role="line" 50.770 + id="tspan3467" 50.771 + x="197.13031" 50.772 + y="485.51224" 50.773 + style="font-family:Courier">ecacb6b4c9fd</tspan></text> 50.774 + </g> 50.775 + <g 50.776 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 50.777 + id="g3469"> 50.778 + <rect 50.779 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.780 + id="rect3471" 50.781 + width="103.14286" 50.782 + height="48.571426" 50.783 + x="299.67859" 50.784 + y="447.71451" /> 50.785 + <text 50.786 + xml:space="preserve" 50.787 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.788 + x="308.89639" 50.789 + y="464.8139" 50.790 + id="text3473"><tspan 50.791 + id="tspan3475" 50.792 + sodipodi:role="line" 50.793 + x="308.89639" 50.794 + y="464.8139">Segundo padre</tspan></text> 50.795 + <text 50.796 + xml:space="preserve" 50.797 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.798 + x="308.20175" 50.799 + y="485.50256" 50.800 + id="text3477"><tspan 50.801 + sodipodi:role="line" 50.802 + id="tspan3479" 50.803 + x="308.20175" 50.804 + y="485.50256" 50.805 + style="font-family:Courier">000000000000</tspan></text> 50.806 + </g> 50.807 + <g 50.808 + transform="matrix(0.423343,0,0,0.423343,198.2489,152.137)" 50.809 + id="g3481"> 50.810 + <rect 50.811 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.812 + id="rect3483" 50.813 + width="103.14286" 50.814 + height="48.571426" 50.815 + x="188.6071" 50.816 + y="311.28598" /> 50.817 + <text 50.818 + xml:space="preserve" 50.819 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.820 + x="197.82495" 50.821 + y="328.38538" 50.822 + id="text3485"><tspan 50.823 + id="tspan3487" 50.824 + sodipodi:role="line" 50.825 + x="197.82495" 50.826 + y="328.38538">Hash de revisión</tspan></text> 50.827 + <text 50.828 + xml:space="preserve" 50.829 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.830 + x="197.13031" 50.831 + y="349.07404" 50.832 + id="text3489"><tspan 50.833 + sodipodi:role="line" 50.834 + id="tspan3491" 50.835 + x="197.13031" 50.836 + y="349.07404" 50.837 + style="font-family:Courier">32bf9a5f22c0</tspan></text> 50.838 + </g> 50.839 + <g 50.840 + transform="matrix(0.423343,0,0,0.423343,198.7176,153.4957)" 50.841 + id="g3493"> 50.842 + <rect 50.843 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.844 + id="rect3495" 50.845 + width="213.85715" 50.846 + height="75" 50.847 + x="187.5" 50.848 + y="363.07654" /> 50.849 + <text 50.850 + xml:space="preserve" 50.851 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.852 + x="196.02321" 50.853 + y="400.86459" 50.854 + id="text3497"><tspan 50.855 + sodipodi:role="line" 50.856 + id="tspan3499" 50.857 + x="196.02321" 50.858 + y="400.86459" 50.859 + style="fill:black;fill-opacity:1;font-family:Courier">...</tspan></text> 50.860 + <text 50.861 + xml:space="preserve" 50.862 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.863 + x="196.71785" 50.864 + y="380.17593" 50.865 + id="text3501"><tspan 50.866 + style="fill:#000000;fill-opacity:1" 50.867 + id="tspan3503" 50.868 + sodipodi:role="line" 50.869 + x="196.71785" 50.870 + y="380.17593">Datos de revisión (delta o snapshot)</tspan></text> 50.871 + </g> 50.872 + </g> 50.873 + <rect 50.874 + y="387.90286" 50.875 + x="272.40894" 50.876 + height="89.506805" 50.877 + width="101.60232" 50.878 + id="rect5081" 50.879 + style="fill:url(#linearGradient5895);fill-opacity:1;stroke:black;stroke-width:0.48811448;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.880 + <g 50.881 + id="g5087" 50.882 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 50.883 + <rect 50.884 + y="447.72418" 50.885 + x="188.6071" 50.886 + height="48.571426" 50.887 + width="103.14286" 50.888 + id="rect5089" 50.889 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.890 + <text 50.891 + id="text5091" 50.892 + y="464.82358" 50.893 + x="197.82495" 50.894 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.895 + xml:space="preserve"><tspan 50.896 + y="464.82358" 50.897 + x="197.82495" 50.898 + sodipodi:role="line" 50.899 + id="tspan5093">Primer padre</tspan></text> 50.900 + <text 50.901 + id="text5095" 50.902 + y="485.51224" 50.903 + x="197.13031" 50.904 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.905 + xml:space="preserve"><tspan 50.906 + style="font-family:Courier" 50.907 + y="485.51224" 50.908 + x="197.13031" 50.909 + id="tspan5097" 50.910 + sodipodi:role="line">ff9dc8bc2a8b</tspan></text> 50.911 + </g> 50.912 + <g 50.913 + id="g5099" 50.914 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 50.915 + <rect 50.916 + y="447.71451" 50.917 + x="299.67859" 50.918 + height="48.571426" 50.919 + width="103.14286" 50.920 + id="rect5101" 50.921 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.922 + <text 50.923 + id="text5103" 50.924 + y="464.8139" 50.925 + x="308.89639" 50.926 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.927 + xml:space="preserve"><tspan 50.928 + y="464.8139" 50.929 + x="308.89639" 50.930 + sodipodi:role="line" 50.931 + id="tspan5105">Segundo padre</tspan></text> 50.932 + <text 50.933 + id="text5107" 50.934 + y="485.50256" 50.935 + x="308.20175" 50.936 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.937 + xml:space="preserve"><tspan 50.938 + style="font-family:Courier" 50.939 + y="485.50256" 50.940 + x="308.20175" 50.941 + id="tspan5109" 50.942 + sodipodi:role="line">000000000000</tspan></text> 50.943 + </g> 50.944 + <g 50.945 + id="g5111" 50.946 + transform="matrix(0.423343,0,0,0.423343,198.0214,261.7142)"> 50.947 + <rect 50.948 + y="311.28598" 50.949 + x="188.6071" 50.950 + height="48.571426" 50.951 + width="103.14286" 50.952 + id="rect5113" 50.953 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.954 + <text 50.955 + id="text5115" 50.956 + y="328.38538" 50.957 + x="197.82495" 50.958 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.959 + xml:space="preserve"><tspan 50.960 + y="328.38538" 50.961 + x="197.82495" 50.962 + sodipodi:role="line" 50.963 + id="tspan5117">Hash de revisión</tspan></text> 50.964 + <text 50.965 + id="text5119" 50.966 + y="349.07404" 50.967 + x="197.13031" 50.968 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.969 + xml:space="preserve"><tspan 50.970 + style="font-family:Courier" 50.971 + y="349.07404" 50.972 + x="197.13031" 50.973 + id="tspan5121" 50.974 + sodipodi:role="line">ecacb6b4c9fd</tspan></text> 50.975 + </g> 50.976 + <g 50.977 + id="g5123" 50.978 + transform="matrix(0.423343,0,0,0.423343,198.4901,263.0729)"> 50.979 + <rect 50.980 + y="363.07654" 50.981 + x="187.5" 50.982 + height="75" 50.983 + width="213.85715" 50.984 + id="rect5125" 50.985 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 50.986 + <text 50.987 + id="text5127" 50.988 + y="400.86459" 50.989 + x="196.02321" 50.990 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.991 + xml:space="preserve"><tspan 50.992 + style="fill:black;fill-opacity:1;font-family:Courier" 50.993 + y="400.86459" 50.994 + x="196.02321" 50.995 + id="tspan5129" 50.996 + sodipodi:role="line">...</tspan></text> 50.997 + <text 50.998 + id="text5131" 50.999 + y="380.17593" 50.1000 + x="196.71785" 50.1001 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.1002 + xml:space="preserve"><tspan 50.1003 + y="380.17593" 50.1004 + x="196.71785" 50.1005 + sodipodi:role="line" 50.1006 + id="tspan5133" 50.1007 + style="fill:#000000;fill-opacity:1">Datos de revisión (delta o snapshot)</tspan></text> 50.1008 + </g> 50.1009 + <path 50.1010 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 50.1011 + d="M 299.69935,362.24027 L 299.69931,393.49494" 50.1012 + id="path5203" 50.1013 + inkscape:connector-type="polyline" 50.1014 + inkscape:connection-start="#g3457" 50.1015 + inkscape:connection-end="#g5111" /> 50.1016 + <path 50.1017 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 50.1018 + d="M 182.35357,362.22647 L 241.2842,503.07224" 50.1019 + id="path5271" 50.1020 + inkscape:connector-type="polyline" 50.1021 + inkscape:connection-start="#g3399" 50.1022 + inkscape:connection-end="#g3539" /> 50.1023 + <path 50.1024 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 50.1025 + d="M 287.63109,471.81747 L 250.9438,503.07223" 50.1026 + id="path5285" 50.1027 + inkscape:connector-type="polyline" 50.1028 + inkscape:connection-start="#g5087" 50.1029 + inkscape:connection-end="#g3539" /> 50.1030 + <path 50.1031 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 50.1032 + d="M 290.80419,250.07192 L 297.80065,283.90394" 50.1033 + id="path5077" 50.1034 + inkscape:connector-type="polyline" 50.1035 + inkscape:connection-start="#g3215" 50.1036 + inkscape:connection-end="#g3481" /> 50.1037 + <path 50.1038 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 50.1039 + d="M 229.63373,250.07601 L 190.07484,283.90394" 50.1040 + id="path5075" 50.1041 + inkscape:connector-type="polyline" 50.1042 + inkscape:connection-end="#g3423" /> 50.1043 + <text 50.1044 + xml:space="preserve" 50.1045 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.1046 + x="131.5625" 50.1047 + y="100.79968" 50.1048 + id="text5897"><tspan 50.1049 + sodipodi:role="line" 50.1050 + id="tspan5899" 50.1051 + x="131.5625" 50.1052 + y="100.79968" 50.1053 + style="text-align:end;text-anchor:end">Revisión principal</tspan><tspan 50.1054 + sodipodi:role="line" 50.1055 + x="131.5625" 50.1056 + y="115.79968" 50.1057 + id="tspan5901" 50.1058 + style="text-align:end;text-anchor:end">(sin hijos)</tspan></text> 50.1059 + <text 50.1060 + xml:space="preserve" 50.1061 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.1062 + x="131.5625" 50.1063 + y="207.04968" 50.1064 + id="text5903"><tspan 50.1065 + sodipodi:role="line" 50.1066 + id="tspan5905" 50.1067 + x="131.5625" 50.1068 + y="207.04968" 50.1069 + style="text-align:end;text-anchor:end">Revisión de fusión</tspan><tspan 50.1070 + sodipodi:role="line" 50.1071 + x="131.5625" 50.1072 + y="222.04968" 50.1073 + id="tspan5907" 50.1074 + style="text-align:end;text-anchor:end">(dos padres)</tspan></text> 50.1075 + <text 50.1076 + xml:space="preserve" 50.1077 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.1078 + x="131.92578" 50.1079 + y="451.58093" 50.1080 + id="text5909"><tspan 50.1081 + sodipodi:role="line" 50.1082 + id="tspan5911" 50.1083 + x="131.92578" 50.1084 + y="451.58093" 50.1085 + style="text-align:end;text-anchor:end">Ramas</tspan><tspan 50.1086 + sodipodi:role="line" 50.1087 + x="131.92578" 50.1088 + y="466.58093" 50.1089 + id="tspan5913" 50.1090 + style="text-align:end;text-anchor:end">(dos revisiones,</tspan><tspan 50.1091 + sodipodi:role="line" 50.1092 + x="131.92578" 50.1093 + y="481.58093" 50.1094 + id="tspan5915" 50.1095 + style="text-align:end;text-anchor:end">mismo padre)</tspan></text> 50.1096 + <path 50.1097 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 50.1098 + d="M 111.71875,433.61218 L 154.7268,368.52294" 50.1099 + id="path5917" 50.1100 + inkscape:connector-type="polyline" /> 50.1101 + <path 50.1102 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 50.1103 + d="M 134.375,464.86218 L 277.86691,440.37816" 50.1104 + id="path5919" 50.1105 + inkscape:connector-type="polyline" 50.1106 + inkscape:connection-end="#g5123" /> 50.1107 + <text 50.1108 + xml:space="preserve" 50.1109 + style="font-size:12px;font-style:normal;font-weight:normal;text-align:end;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.1110 + x="131.5625" 50.1111 + y="536.73718" 50.1112 + id="text5927"><tspan 50.1113 + sodipodi:role="line" 50.1114 + id="tspan5929" 50.1115 + x="131.5625" 50.1116 + y="536.73718">Primera revisión</tspan><tspan 50.1117 + sodipodi:role="line" 50.1118 + x="131.5625" 50.1119 + y="551.73718" 50.1120 + id="tspan5931">(ambos padres nulos)</tspan></text> 50.1121 + <rect 50.1122 + style="fill:#bbb4ff;fill-opacity:1;stroke:none;stroke-width:0.95291203;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 50.1123 + id="rect2830" 50.1124 + width="43.664806" 50.1125 + height="20.562374" 50.1126 + x="217.0432" 50.1127 + y="232.10075" /> 50.1128 + <text 50.1129 + xml:space="preserve" 50.1130 + style="font-size:5.0801158px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.1131 + x="220.94551" 50.1132 + y="239.33966" 50.1133 + id="text2832"><tspan 50.1134 + id="tspan2836" 50.1135 + sodipodi:role="line" 50.1136 + x="220.94551" 50.1137 + y="239.33966">Primer padre</tspan></text> 50.1138 + <text 50.1139 + xml:space="preserve" 50.1140 + style="font-size:5.0801158px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 50.1141 + x="220.65144" 50.1142 + y="248.09805" 50.1143 + id="text2879"><tspan 50.1144 + sodipodi:role="line" 50.1145 + id="tspan2881" 50.1146 + x="220.65144" 50.1147 + y="248.09805" 50.1148 + style="font-family:Courier">5b80c922ebdd</tspan></text> 50.1149 + <path 50.1150 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 50.1151 + d="M 139.84375,107.83093 L 210.15625,107.83093" 50.1152 + id="path5965" 50.1153 + inkscape:connector-type="polyline" /> 50.1154 + <path 50.1155 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 50.1156 + d="M 137.5,213.29968 L 210.49036,214.09055" 50.1157 + id="path5967" 50.1158 + inkscape:connector-type="polyline" /> 50.1159 + <path 50.1160 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0;stroke-opacity:1;display:inline" 50.1161 + d="M 136.34375,544.54968 L 206.65625,544.54968" 50.1162 + id="path5969" 50.1163 + inkscape:connector-type="polyline" 50.1164 + inkscape:transform-center-y="-171.09375" 50.1165 + inkscape:transform-center-x="53.90625" /> 50.1166 + </g> 50.1167 +</svg>
51.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 51.2 +++ b/es/snapshot.svg Sat Oct 18 07:48:21 2008 -0500 51.3 @@ -0,0 +1,212 @@ 51.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 51.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 51.6 +<svg 51.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 51.8 + xmlns:cc="http://creativecommons.org/ns#" 51.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 51.10 + xmlns:svg="http://www.w3.org/2000/svg" 51.11 + xmlns="http://www.w3.org/2000/svg" 51.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 51.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 51.14 + width="744.09448819" 51.15 + height="1052.3622047" 51.16 + id="svg2807" 51.17 + sodipodi:version="0.32" 51.18 + inkscape:version="0.46" 51.19 + sodipodi:docbase="/home/bos/hg/hgbook/en" 51.20 + sodipodi:docname="snapshot.svg" 51.21 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 51.22 + <defs 51.23 + id="defs2809"> 51.24 + <inkscape:perspective 51.25 + sodipodi:type="inkscape:persp3d" 51.26 + inkscape:vp_x="0 : 526.18109 : 1" 51.27 + inkscape:vp_y="0 : 1000 : 0" 51.28 + inkscape:vp_z="744.09448 : 526.18109 : 1" 51.29 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 51.30 + id="perspective2759" /> 51.31 + </defs> 51.32 + <sodipodi:namedview 51.33 + id="base" 51.34 + pagecolor="#ffffff" 51.35 + bordercolor="#666666" 51.36 + borderopacity="1.0" 51.37 + gridtolerance="10000" 51.38 + guidetolerance="10" 51.39 + objecttolerance="10" 51.40 + inkscape:pageopacity="0.0" 51.41 + inkscape:pageshadow="2" 51.42 + inkscape:zoom="1.4" 51.43 + inkscape:cx="252.04111" 51.44 + inkscape:cy="605.75448" 51.45 + inkscape:document-units="px" 51.46 + inkscape:current-layer="layer1" 51.47 + inkscape:window-width="906" 51.48 + inkscape:window-height="721" 51.49 + inkscape:window-x="141" 51.50 + inkscape:window-y="57" 51.51 + showgrid="false" /> 51.52 + <metadata 51.53 + id="metadata2812"> 51.54 + <rdf:RDF> 51.55 + <cc:Work 51.56 + rdf:about=""> 51.57 + <dc:format>image/svg+xml</dc:format> 51.58 + <dc:type 51.59 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 51.60 + </cc:Work> 51.61 + </rdf:RDF> 51.62 + </metadata> 51.63 + <g 51.64 + inkscape:label="Layer 1" 51.65 + inkscape:groupmode="layer" 51.66 + id="layer1"> 51.67 + <rect 51.68 + style="opacity:1;fill:#d3ceff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.88795626;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 51.69 + id="rect2817" 51.70 + width="118.18347" 51.71 + height="245.32632" 51.72 + x="243.05112" 51.73 + y="315.4133" 51.74 + inkscape:transform-center-x="136.84403" 51.75 + inkscape:transform-center-y="-66.529183" /> 51.76 + <rect 51.77 + y="315.04153" 51.78 + x="46.965065" 51.79 + height="97.803009" 51.80 + width="108.92702" 51.81 + id="rect2815" 51.82 + style="fill:#ffced6;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.14441991;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 51.83 + <g 51.84 + id="g3814"> 51.85 + <rect 51.86 + y="348.94302" 51.87 + x="59.285713" 51.88 + height="30" 51.89 + width="84.285713" 51.90 + id="rect2819" 51.91 + style="fill:#ff6e86;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 51.92 + ry="0" /> 51.93 + <text 51.94 + id="text2821" 51.95 + y="368.02701" 51.96 + x="72.717636" 51.97 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 51.98 + xml:space="preserve"><tspan 51.99 + y="368.02701" 51.100 + x="72.717636" 51.101 + id="tspan2823" 51.102 + sodipodi:role="line">Índice, rev 7</tspan></text> 51.103 + </g> 51.104 + <text 51.105 + id="text3722" 51.106 + y="303.43359" 51.107 + x="22.61635" 51.108 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 51.109 + xml:space="preserve"><tspan 51.110 + y="303.43359" 51.111 + x="22.61635" 51.112 + id="tspan3724" 51.113 + sodipodi:role="line">Índice de bitácora de revisiones (archivo .i)</tspan></text> 51.114 + <text 51.115 + id="text3726" 51.116 + y="301.29074" 51.117 + x="241.90207" 51.118 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 51.119 + xml:space="preserve"><tspan 51.120 + y="301.29074" 51.121 + x="241.90207" 51.122 + id="tspan3728" 51.123 + sodipodi:role="line">Datos de Bitacora de revisiones (archivo .d)</tspan></text> 51.124 + <path 51.125 + style="fill:#c695ff;fill-opacity:0.60109288;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 51.126 + d="M 143.57143,348.07647 L 255,368.07646 L 255.71429,544.50504 L 142.85714,379.50504 L 143.57143,348.07647 z " 51.127 + id="path3839" 51.128 + sodipodi:nodetypes="ccccc" /> 51.129 + <rect 51.130 + style="fill:#4733ff;fill-opacity:1;stroke:#a7a7a7;stroke-width:2.35124183;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 51.131 + id="rect3752" 51.132 + width="92.720184" 51.133 + height="67.005905" 51.134 + x="255.42564" 51.135 + y="368.64264" /> 51.136 + <text 51.137 + xml:space="preserve" 51.138 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 51.139 + x="264.45859" 51.140 + y="387.30099" 51.141 + id="text3754"><tspan 51.142 + sodipodi:role="line" 51.143 + id="tspan3756" 51.144 + x="264.45859" 51.145 + y="387.30099">Snapshot, rev 4</tspan></text> 51.146 + <rect 51.147 + style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 51.148 + id="rect3761" 51.149 + width="93.49366" 51.150 + height="29.922237" 51.151 + x="255.03891" 51.152 + y="442.04395" /> 51.153 + <text 51.154 + xml:space="preserve" 51.155 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 51.156 + x="263.2662" 51.157 + y="460.17206" 51.158 + id="text3763"><tspan 51.159 + sodipodi:role="line" 51.160 + id="tspan3765" 51.161 + x="263.2662" 51.162 + y="460.17206">Delta, rev 4 a 5</tspan></text> 51.163 + <rect 51.164 + style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 51.165 + id="rect3774" 51.166 + width="93.49366" 51.167 + height="29.922237" 51.168 + x="255.03891" 51.169 + y="477.97485" /> 51.170 + <text 51.171 + xml:space="preserve" 51.172 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 51.173 + x="263.2662" 51.174 + y="496.10297" 51.175 + id="text3776"><tspan 51.176 + sodipodi:role="line" 51.177 + id="tspan3778" 51.178 + x="263.2662" 51.179 + y="496.10297">Delta, rev 5 a 6</tspan></text> 51.180 + <rect 51.181 + style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 51.182 + id="rect3782" 51.183 + width="93.49366" 51.184 + height="29.922237" 51.185 + x="255.03891" 51.186 + y="513.90576" /> 51.187 + <text 51.188 + xml:space="preserve" 51.189 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 51.190 + x="263.2662" 51.191 + y="532.03387" 51.192 + id="text3784"><tspan 51.193 + sodipodi:role="line" 51.194 + id="tspan3786" 51.195 + x="263.2662" 51.196 + y="532.03387">Delta, rev 6 a 7</tspan></text> 51.197 + <rect 51.198 + style="fill:#7c6eff;fill-opacity:1;stroke:#a7a7a7;stroke-width:1.57776296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 51.199 + id="rect3889" 51.200 + width="93.49366" 51.201 + height="29.922237" 51.202 + x="255.03891" 51.203 + y="332.32489" /> 51.204 + <text 51.205 + xml:space="preserve" 51.206 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 51.207 + x="263.2662" 51.208 + y="350.453" 51.209 + id="text3891"><tspan 51.210 + sodipodi:role="line" 51.211 + id="tspan3893" 51.212 + x="263.2662" 51.213 + y="350.453">Delta, rev 2 a 3</tspan></text> 51.214 + </g> 51.215 +</svg>
52.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 52.2 +++ b/es/tour-history.svg Sat Oct 18 07:48:21 2008 -0500 52.3 @@ -0,0 +1,298 @@ 52.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 52.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 52.6 +<svg 52.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 52.8 + xmlns:cc="http://creativecommons.org/ns#" 52.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 52.10 + xmlns:svg="http://www.w3.org/2000/svg" 52.11 + xmlns="http://www.w3.org/2000/svg" 52.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 52.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 52.14 + width="744.09448819" 52.15 + height="1052.3622047" 52.16 + id="svg2" 52.17 + sodipodi:version="0.32" 52.18 + inkscape:version="0.46" 52.19 + sodipodi:docname="tour-history.svg" 52.20 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 52.21 + <defs 52.22 + id="defs4"> 52.23 + <inkscape:perspective 52.24 + sodipodi:type="inkscape:persp3d" 52.25 + inkscape:vp_x="0 : 526.18109 : 1" 52.26 + inkscape:vp_y="0 : 1000 : 0" 52.27 + inkscape:vp_z="744.09448 : 526.18109 : 1" 52.28 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 52.29 + id="perspective2812" /> 52.30 + <marker 52.31 + inkscape:stockid="Arrow1Mstart" 52.32 + orient="auto" 52.33 + refY="0.0" 52.34 + refX="0.0" 52.35 + id="Arrow1Mstart" 52.36 + style="overflow:visible"> 52.37 + <path 52.38 + id="path2973" 52.39 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 52.40 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 52.41 + transform="scale(0.4) translate(10,0)" /> 52.42 + </marker> 52.43 + <marker 52.44 + inkscape:stockid="Arrow1Mend" 52.45 + orient="auto" 52.46 + refY="0.0" 52.47 + refX="0.0" 52.48 + id="Arrow1Mend" 52.49 + style="overflow:visible;"> 52.50 + <path 52.51 + id="path3066" 52.52 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 52.53 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 52.54 + transform="scale(0.4) rotate(180) translate(10,0)" /> 52.55 + </marker> 52.56 + </defs> 52.57 + <sodipodi:namedview 52.58 + id="base" 52.59 + pagecolor="#ffffff" 52.60 + bordercolor="#666666" 52.61 + borderopacity="1.0" 52.62 + gridtolerance="10000" 52.63 + guidetolerance="10" 52.64 + objecttolerance="10" 52.65 + inkscape:pageopacity="0.0" 52.66 + inkscape:pageshadow="2" 52.67 + inkscape:zoom="1.4" 52.68 + inkscape:cx="232.14286" 52.69 + inkscape:cy="672.75296" 52.70 + inkscape:document-units="px" 52.71 + inkscape:current-layer="layer1" 52.72 + inkscape:window-width="906" 52.73 + inkscape:window-height="659" 52.74 + inkscape:window-x="5" 52.75 + inkscape:window-y="49" 52.76 + showgrid="false" /> 52.77 + <metadata 52.78 + id="metadata7"> 52.79 + <rdf:RDF> 52.80 + <cc:Work 52.81 + rdf:about=""> 52.82 + <dc:format>image/svg+xml</dc:format> 52.83 + <dc:type 52.84 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 52.85 + </cc:Work> 52.86 + </rdf:RDF> 52.87 + </metadata> 52.88 + <g 52.89 + inkscape:label="Layer 1" 52.90 + inkscape:groupmode="layer" 52.91 + id="layer1"> 52.92 + <rect 52.93 + style="opacity:1;fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 52.94 + id="rect1878" 52.95 + width="94.285713" 52.96 + height="20.714285" 52.97 + x="138" 52.98 + y="479.50504" /> 52.99 + <text 52.100 + xml:space="preserve" 52.101 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 52.102 + x="162.09892" 52.103 + y="493.12619" 52.104 + id="text1872"><tspan 52.105 + sodipodi:role="line" 52.106 + id="tspan1874" 52.107 + x="162.09892" 52.108 + y="493.12619" 52.109 + style="font-family:Courier"><tspan 52.110 + style="font-weight:bold" 52.111 + id="tspan1876">0</tspan>: REV0</tspan></text> 52.112 + <rect 52.113 + style="opacity:1;fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 52.114 + id="rect2800" 52.115 + width="94.285713" 52.116 + height="20.714285" 52.117 + x="138" 52.118 + y="432.63004" /> 52.119 + <text 52.120 + xml:space="preserve" 52.121 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 52.122 + x="162.09892" 52.123 + y="446.25119" 52.124 + id="text2794"><tspan 52.125 + sodipodi:role="line" 52.126 + id="tspan2796" 52.127 + x="162.09892" 52.128 + y="446.25119" 52.129 + style="font-family:Courier"><tspan 52.130 + id="tspan2868" 52.131 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 52.132 + <rect 52.133 + style="opacity:1;fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 52.134 + id="rect2810" 52.135 + width="94.285713" 52.136 + height="20.714285" 52.137 + x="138" 52.138 + y="385.75504" /> 52.139 + <text 52.140 + xml:space="preserve" 52.141 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 52.142 + x="162.09892" 52.143 + y="399.37619" 52.144 + id="text2804"><tspan 52.145 + sodipodi:role="line" 52.146 + id="tspan2806" 52.147 + x="162.09892" 52.148 + y="399.37619" 52.149 + style="font-family:Courier"><tspan 52.150 + style="font-weight:bold" 52.151 + id="tspan2866">2</tspan>: REV2</tspan></text> 52.152 + <rect 52.153 + style="opacity:1;fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 52.154 + id="rect2820" 52.155 + width="94.285713" 52.156 + height="20.714285" 52.157 + x="138" 52.158 + y="338.88007" /> 52.159 + <text 52.160 + xml:space="preserve" 52.161 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 52.162 + x="162.09892" 52.163 + y="352.50122" 52.164 + id="text2814"><tspan 52.165 + sodipodi:role="line" 52.166 + id="tspan2816" 52.167 + x="162.09892" 52.168 + y="352.50122" 52.169 + style="font-family:Courier"><tspan 52.170 + style="font-weight:bold" 52.171 + id="tspan2864">3</tspan>: REV3</tspan></text> 52.172 + <rect 52.173 + style="opacity:1;fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 52.174 + id="rect2830" 52.175 + width="94.285713" 52.176 + height="20.714285" 52.177 + x="138" 52.178 + y="292.00504" /> 52.179 + <text 52.180 + xml:space="preserve" 52.181 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 52.182 + x="162.09892" 52.183 + y="305.62619" 52.184 + id="text2824"><tspan 52.185 + sodipodi:role="line" 52.186 + id="tspan2826" 52.187 + x="162.09892" 52.188 + y="305.62619" 52.189 + style="font-family:Courier"><tspan 52.190 + style="font-weight:bold" 52.191 + id="tspan2862">4</tspan>: REV4</tspan></text> 52.192 + <text 52.193 + xml:space="preserve" 52.194 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 52.195 + x="173.57143" 52.196 + y="443.79074" 52.197 + id="text2832"><tspan 52.198 + sodipodi:role="line" 52.199 + id="tspan2834" 52.200 + x="173.57143" 52.201 + y="443.79074" /></text> 52.202 + <path 52.203 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 52.204 + d="M 185.14286,478.50504 L 185.14286,454.34432" 52.205 + id="path2894" 52.206 + inkscape:connector-type="polyline" /> 52.207 + <path 52.208 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 52.209 + d="M 185.14286,431.63004 L 185.14286,407.46932" 52.210 + id="path2896" 52.211 + inkscape:connector-type="polyline" /> 52.212 + <path 52.213 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 52.214 + d="M 185.14286,384.75504 L 185.14286,360.59435" 52.215 + id="path2898" 52.216 + inkscape:connector-type="polyline" /> 52.217 + <path 52.218 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 52.219 + d="M 185.14286,337.88007 L 185.14286,313.71932" 52.220 + id="path2900" 52.221 + inkscape:connector-type="polyline" /> 52.222 + <text 52.223 + xml:space="preserve" 52.224 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times" 52.225 + x="244.60992" 52.226 + y="305.245" 52.227 + id="text1902"><tspan 52.228 + sodipodi:role="line" 52.229 + id="tspan1904" 52.230 + x="244.60992" 52.231 + y="305.245">(la más nueva)</tspan></text> 52.232 + <text 52.233 + xml:space="preserve" 52.234 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times" 52.235 + x="244.60992" 52.236 + y="492.745" 52.237 + id="text1906"><tspan 52.238 + sodipodi:role="line" 52.239 + id="tspan1908" 52.240 + x="244.60992" 52.241 + y="492.745">(la más antigua)</tspan></text> 52.242 + <rect 52.243 + style="opacity:1;fill:#d2e1e4;fill-opacity:1;stroke:#b1cbd0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 52.244 + id="rect1907" 52.245 + width="94.285713" 52.246 + height="20.714285" 52.247 + x="309.28571" 52.248 + y="324.86218" /> 52.249 + <text 52.250 + xml:space="preserve" 52.251 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 52.252 + x="333.38464" 52.253 + y="338.48334" 52.254 + id="text1909"><tspan 52.255 + sodipodi:role="line" 52.256 + id="tspan1911" 52.257 + x="333.38464" 52.258 + y="338.48334" 52.259 + style="font-family:Courier"><tspan 52.260 + style="font-weight:bold" 52.261 + id="tspan1913">4</tspan>: REV4</tspan></text> 52.262 + <path 52.263 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 52.264 + d="M 332.14286,375.21932 L 335.71429,347.36218" 52.265 + id="path2802" /> 52.266 + <path 52.267 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 52.268 + d="M 372.69968,375.21932 L 369.12825,347.36218" 52.269 + id="path2986" /> 52.270 + <text 52.271 + xml:space="preserve" 52.272 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times" 52.273 + x="335.14285" 52.274 + y="387.21933" 52.275 + id="text2988"><tspan 52.276 + sodipodi:role="line" 52.277 + x="335.14285" 52.278 + y="387.21933" 52.279 + id="tspan3020" 52.280 + style="text-align:end;text-anchor:end">número de</tspan><tspan 52.281 + sodipodi:role="line" 52.282 + x="335.14285" 52.283 + y="402.21933" 52.284 + id="tspan3014" 52.285 + style="text-align:end;text-anchor:end">revisión</tspan></text> 52.286 + <text 52.287 + xml:space="preserve" 52.288 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times" 52.289 + x="368.71429" 52.290 + y="387.21933" 52.291 + id="text2994"><tspan 52.292 + sodipodi:role="line" 52.293 + id="tspan2996" 52.294 + x="368.71429" 52.295 + y="387.21933">identificador del</tspan><tspan 52.296 + sodipodi:role="line" 52.297 + x="368.71429" 52.298 + y="402.21933" 52.299 + id="tspan2998">conjunto de cambios</tspan></text> 52.300 + </g> 52.301 +</svg>
53.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 53.2 +++ b/es/tour-merge-conflict.svg Sat Oct 18 07:48:21 2008 -0500 53.3 @@ -0,0 +1,219 @@ 53.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 53.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 53.6 +<svg 53.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 53.8 + xmlns:cc="http://creativecommons.org/ns#" 53.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 53.10 + xmlns:svg="http://www.w3.org/2000/svg" 53.11 + xmlns="http://www.w3.org/2000/svg" 53.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 53.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 53.14 + width="744.09448819" 53.15 + height="1052.3622047" 53.16 + id="svg2" 53.17 + sodipodi:version="0.32" 53.18 + inkscape:version="0.46" 53.19 + sodipodi:docname="tour-merge-conflict.svg" 53.20 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 53.21 + <defs 53.22 + id="defs4"> 53.23 + <inkscape:perspective 53.24 + sodipodi:type="inkscape:persp3d" 53.25 + inkscape:vp_x="0 : 526.18109 : 1" 53.26 + inkscape:vp_y="0 : 1000 : 0" 53.27 + inkscape:vp_z="744.09448 : 526.18109 : 1" 53.28 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 53.29 + id="perspective2861" /> 53.30 + <marker 53.31 + inkscape:stockid="Arrow1Mend" 53.32 + orient="auto" 53.33 + refY="0.0" 53.34 + refX="0.0" 53.35 + id="Arrow1Mend" 53.36 + style="overflow:visible;"> 53.37 + <path 53.38 + id="path3053" 53.39 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 53.40 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 53.41 + transform="scale(0.4) rotate(180) translate(10,0)" /> 53.42 + </marker> 53.43 + </defs> 53.44 + <sodipodi:namedview 53.45 + id="base" 53.46 + pagecolor="#ffffff" 53.47 + bordercolor="#666666" 53.48 + borderopacity="1.0" 53.49 + gridtolerance="10000" 53.50 + guidetolerance="10" 53.51 + objecttolerance="10" 53.52 + inkscape:pageopacity="0.0" 53.53 + inkscape:pageshadow="2" 53.54 + inkscape:zoom="1.4" 53.55 + inkscape:cx="251.65243" 53.56 + inkscape:cy="733.42197" 53.57 + inkscape:document-units="px" 53.58 + inkscape:current-layer="layer1" 53.59 + inkscape:window-width="906" 53.60 + inkscape:window-height="659" 53.61 + inkscape:window-x="5" 53.62 + inkscape:window-y="49" 53.63 + showgrid="false" /> 53.64 + <metadata 53.65 + id="metadata7"> 53.66 + <rdf:RDF> 53.67 + <cc:Work 53.68 + rdf:about=""> 53.69 + <dc:format>image/svg+xml</dc:format> 53.70 + <dc:type 53.71 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 53.72 + </cc:Work> 53.73 + </rdf:RDF> 53.74 + </metadata> 53.75 + <g 53.76 + inkscape:label="Layer 1" 53.77 + inkscape:groupmode="layer" 53.78 + id="layer1"> 53.79 + <g 53.80 + id="g1988" 53.81 + transform="translate(84.85711,0)"> 53.82 + <g 53.83 + id="g1876"> 53.84 + <path 53.85 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 53.86 + d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 53.87 + id="path1872" 53.88 + sodipodi:nodetypes="cccccc" /> 53.89 + <path 53.90 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 53.91 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 53.92 + id="path1874" 53.93 + sodipodi:nodetypes="cccc" /> 53.94 + </g> 53.95 + <flowRoot 53.96 + style="font-size:8px;font-family:Times New Roman" 53.97 + id="flowRoot1898" 53.98 + xml:space="preserve"><flowRegion 53.99 + id="flowRegion1900"><rect 53.100 + style="font-size:8px;font-family:Times New Roman" 53.101 + y="464.50504" 53.102 + x="122.85714" 53.103 + height="93.571426" 53.104 + width="76.428574" 53.105 + id="rect1902" /></flowRegion><flowPara 53.106 + id="flowPara1904">Saludos!</flowPara><flowPara 53.107 + id="flowPara1906" /><flowPara 53.108 + id="flowPara1908">Soy Mariam Abacha, la esposa del anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot> </g> 53.109 + <g 53.110 + id="g1966" 53.111 + transform="translate(82,0.35715)"> 53.112 + <g 53.113 + transform="translate(-77.85718,-140.0714)" 53.114 + id="g1910"> 53.115 + <path 53.116 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 53.117 + d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 53.118 + id="path1912" 53.119 + sodipodi:nodetypes="cccccc" /> 53.120 + <path 53.121 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 53.122 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 53.123 + id="path1914" 53.124 + sodipodi:nodetypes="cccc" /> 53.125 + </g> 53.126 + <flowRoot 53.127 + transform="translate(-77.85718,-140.0714)" 53.128 + style="font-size:8px;font-family:Times New Roman" 53.129 + id="flowRoot1916" 53.130 + xml:space="preserve"><flowRegion 53.131 + id="flowRegion1918"><rect 53.132 + style="font-size:8px;font-family:Times New Roman" 53.133 + y="464.50504" 53.134 + x="122.85714" 53.135 + height="93.571426" 53.136 + width="76.428574" 53.137 + id="rect1920" /></flowRegion><flowPara 53.138 + id="flowPara1922">Saludos!</flowPara><flowPara 53.139 + id="flowPara1924" /><flowPara 53.140 + id="flowPara1926">Soy <flowSpan 53.141 + style="font-style:italic;fill:#ff0000" 53.142 + id="flowSpan3094">Shehu Musa Abacha, sobrina del</flowSpan> anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot> </g> 53.143 + <g 53.144 + id="g1977" 53.145 + transform="translate(81.99999,-0.35715)"> 53.146 + <g 53.147 + transform="translate(83.57141,-139.3571)" 53.148 + id="g1932"> 53.149 + <path 53.150 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 53.151 + d="M 118.57143,458.21933 L 118.57143,563.79075 L 191.42857,563.79075 L 204.28571,550.93361 L 203.57142,459.6479 L 118.57143,458.21933 z " 53.152 + id="path1934" 53.153 + sodipodi:nodetypes="cccccc" /> 53.154 + <path 53.155 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 53.156 + d="M 191.55484,563.36862 L 191.6923,560.98794 L 192.69126,552.44884 L 203.80416,551.31242" 53.157 + id="path1936" 53.158 + sodipodi:nodetypes="cccc" /> 53.159 + </g> 53.160 + <flowRoot 53.161 + transform="translate(83.57141,-139.3571)" 53.162 + style="font-size:8px;font-family:Times New Roman" 53.163 + id="flowRoot1938" 53.164 + xml:space="preserve"><flowRegion 53.165 + id="flowRegion1940"><rect 53.166 + style="font-size:8px;font-family:Times New Roman" 53.167 + y="464.50504" 53.168 + x="122.85714" 53.169 + height="93.571426" 53.170 + width="76.428574" 53.171 + id="rect1942" /></flowRegion><flowPara 53.172 + id="flowPara1944">Saludos!</flowPara><flowPara 53.173 + id="flowPara1946" /><flowPara 53.174 + id="flowPara1948">Soy <flowSpan 53.175 + style="font-style:italic;fill:#ff0000" 53.176 + id="flowSpan3096">Alhaji Abba Abacha, hijo del</flowSpan> anterior dictador de Nigeria Sani Abacha. Le contacto en secreto, buscando los medios para desarrollar</flowPara></flowRoot> </g> 53.177 + <path 53.178 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 53.179 + d="M 215.502,457.71933 L 196.35507,424.5765" 53.180 + id="path1999" 53.181 + inkscape:connector-type="polyline" 53.182 + inkscape:connection-start="#g1988" 53.183 + inkscape:connection-end="#g1966" /> 53.184 + <path 53.185 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 53.186 + d="M 277.06936,457.71933 L 296.21629,424.5765" 53.187 + id="path2001" 53.188 + inkscape:connector-type="polyline" 53.189 + inkscape:connection-start="#g1988" 53.190 + inkscape:connection-end="#g1977" /> 53.191 + <text 53.192 + xml:space="preserve" 53.193 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 53.194 + x="302.42859" 53.195 + y="515.08905" 53.196 + id="text1905"><tspan 53.197 + sodipodi:role="line" 53.198 + id="tspan1907" 53.199 + x="302.42859" 53.200 + y="515.08905">Versión inicial</tspan></text> 53.201 + <text 53.202 + xml:space="preserve" 53.203 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 53.204 + x="30.57143" 53.205 + y="374.1619" 53.206 + id="text1917"><tspan 53.207 + sodipodi:role="line" 53.208 + id="tspan1919" 53.209 + x="30.57143" 53.210 + y="374.1619">Nuestros cambios</tspan></text> 53.211 + <text 53.212 + xml:space="preserve" 53.213 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 53.214 + x="385.71429" 53.215 + y="374.1619" 53.216 + id="text1921"><tspan 53.217 + sodipodi:role="line" 53.218 + id="tspan1923" 53.219 + x="385.71429" 53.220 + y="374.1619">Sus cambios</tspan></text> 53.221 + </g> 53.222 +</svg>
54.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 54.2 +++ b/es/tour-merge-merge.svg Sat Oct 18 07:48:21 2008 -0500 54.3 @@ -0,0 +1,389 @@ 54.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 54.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 54.6 +<svg 54.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 54.8 + xmlns:cc="http://creativecommons.org/ns#" 54.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 54.10 + xmlns:svg="http://www.w3.org/2000/svg" 54.11 + xmlns="http://www.w3.org/2000/svg" 54.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 54.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 54.14 + width="744.09448819" 54.15 + height="1052.3622047" 54.16 + id="svg2" 54.17 + sodipodi:version="0.32" 54.18 + inkscape:version="0.46" 54.19 + sodipodi:docname="tour-merge-merge.svg" 54.20 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 54.21 + <defs 54.22 + id="defs4"> 54.23 + <inkscape:perspective 54.24 + sodipodi:type="inkscape:persp3d" 54.25 + inkscape:vp_x="0 : 526.18109 : 1" 54.26 + inkscape:vp_y="0 : 1000 : 0" 54.27 + inkscape:vp_z="744.09448 : 526.18109 : 1" 54.28 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 54.29 + id="perspective2928" /> 54.30 + <marker 54.31 + inkscape:stockid="Arrow1Mstart" 54.32 + orient="auto" 54.33 + refY="0.0" 54.34 + refX="0.0" 54.35 + id="Arrow1Mstart" 54.36 + style="overflow:visible"> 54.37 + <path 54.38 + id="path2973" 54.39 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 54.40 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 54.41 + transform="scale(0.4) translate(10,0)" /> 54.42 + </marker> 54.43 + <marker 54.44 + inkscape:stockid="Arrow1Mend" 54.45 + orient="auto" 54.46 + refY="0.0" 54.47 + refX="0.0" 54.48 + id="Arrow1Mend" 54.49 + style="overflow:visible;"> 54.50 + <path 54.51 + id="path3066" 54.52 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 54.53 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 54.54 + transform="scale(0.4) rotate(180) translate(10,0)" /> 54.55 + </marker> 54.56 + </defs> 54.57 + <sodipodi:namedview 54.58 + id="base" 54.59 + pagecolor="#ffffff" 54.60 + bordercolor="#666666" 54.61 + borderopacity="1.0" 54.62 + gridtolerance="10000" 54.63 + guidetolerance="10" 54.64 + objecttolerance="10" 54.65 + inkscape:pageopacity="0.0" 54.66 + inkscape:pageshadow="2" 54.67 + inkscape:zoom="0.98994949" 54.68 + inkscape:cx="328.35015" 54.69 + inkscape:cy="790.24518" 54.70 + inkscape:document-units="px" 54.71 + inkscape:current-layer="layer1" 54.72 + inkscape:window-width="906" 54.73 + inkscape:window-height="659" 54.74 + inkscape:window-x="38" 54.75 + inkscape:window-y="95" 54.76 + showgrid="false" /> 54.77 + <metadata 54.78 + id="metadata7"> 54.79 + <rdf:RDF> 54.80 + <cc:Work 54.81 + rdf:about=""> 54.82 + <dc:format>image/svg+xml</dc:format> 54.83 + <dc:type 54.84 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 54.85 + </cc:Work> 54.86 + </rdf:RDF> 54.87 + </metadata> 54.88 + <g 54.89 + inkscape:label="Layer 1" 54.90 + inkscape:groupmode="layer" 54.91 + id="layer1"> 54.92 + <rect 54.93 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 54.94 + id="rect2995" 54.95 + width="94.285713" 54.96 + height="20.714285" 54.97 + x="532.85718" 54.98 + y="203.0479" /> 54.99 + <text 54.100 + xml:space="preserve" 54.101 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 54.102 + x="173.57143" 54.103 + y="443.79074" 54.104 + id="text2832"><tspan 54.105 + sodipodi:role="line" 54.106 + id="tspan2834" 54.107 + x="173.57143" 54.108 + y="443.79074" /></text> 54.109 + <rect 54.110 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 54.111 + id="rect2830" 54.112 + width="94.285713" 54.113 + height="20.714285" 54.114 + x="138" 54.115 + y="297.76227" /> 54.116 + <text 54.117 + xml:space="preserve" 54.118 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 54.119 + x="162.09892" 54.120 + y="311.38342" 54.121 + id="text2824"><tspan 54.122 + sodipodi:role="line" 54.123 + id="tspan2826" 54.124 + x="162.09892" 54.125 + y="311.38342" 54.126 + style="font-family:Courier"><tspan 54.127 + style="font-weight:bold" 54.128 + id="tspan2862">4</tspan>: REV4</tspan></text> 54.129 + <path 54.130 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 54.131 + d="M 185.14286,343.63731 L 185.14286,319.47656" 54.132 + id="path2900" 54.133 + inkscape:connector-type="polyline" /> 54.134 + <rect 54.135 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 54.136 + id="rect2863" 54.137 + width="94.285713" 54.138 + height="20.714285" 54.139 + x="91.428574" 54.140 + y="250.47656" /> 54.141 + <text 54.142 + xml:space="preserve" 54.143 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 54.144 + x="116.09886" 54.145 + y="264.56592" 54.146 + id="text1965" 54.147 + transform="scale(1.000002,0.999998)"><tspan 54.148 + sodipodi:role="line" 54.149 + id="tspan1967" 54.150 + x="116.09886" 54.151 + y="264.56592" 54.152 + style="font-family:Courier"><tspan 54.153 + style="font-weight:bold" 54.154 + id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 54.155 + <path 54.156 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 54.157 + d="M 173.95727,296.76228 L 149.75702,272.19085" 54.158 + id="path1971" 54.159 + inkscape:connector-type="polyline" 54.160 + inkscape:connection-end="#rect2863" 54.161 + inkscape:connection-start="#rect2830" /> 54.162 + <rect 54.163 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 54.164 + id="rect2911" 54.165 + width="94.285995" 54.166 + height="20.714283" 54.167 + x="186.71414" 54.168 + y="204.40514" /> 54.169 + <text 54.170 + xml:space="preserve" 54.171 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 54.172 + x="210.81311" 54.173 + y="218.02673" 54.174 + id="text2913" 54.175 + transform="scale(1.000002,0.999998)"><tspan 54.176 + sodipodi:role="line" 54.177 + id="tspan2915" 54.178 + x="210.81311" 54.179 + y="218.02673" 54.180 + style="font-family:Courier"><tspan 54.181 + id="tspan1966" 54.182 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 54.183 + <path 54.184 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 54.185 + d="M 191.06908,296.76228 L 227.93092,226.11942" 54.186 + id="path2919" 54.187 + inkscape:connector-type="polyline" 54.188 + inkscape:connection-start="#rect2830" /> 54.189 + <text 54.190 + xml:space="preserve" 54.191 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 54.192 + x="295.28571" 54.193 + y="217.56711" 54.194 + id="text2871"><tspan 54.195 + sodipodi:role="line" 54.196 + id="tspan2873" 54.197 + x="295.28571" 54.198 + y="217.56711">tip (and head)</tspan></text> 54.199 + <text 54.200 + xml:space="preserve" 54.201 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 54.202 + x="76" 54.203 + y="264.91769" 54.204 + id="text2875"><tspan 54.205 + sodipodi:role="line" 54.206 + id="tspan2877" 54.207 + x="76" 54.208 + y="264.91769" 54.209 + style="text-align:end;text-anchor:end">principal</tspan></text> 54.210 + <rect 54.211 + style="fill:#c8aaa5;fill-opacity:1;stroke:#a07163;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 4;stroke-dashoffset:0;stroke-opacity:1" 54.212 + id="rect1913" 54.213 + width="94.285713" 54.214 + height="20.714285" 54.215 + x="138" 54.216 + y="156.90514" /> 54.217 + <path 54.218 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" 54.219 + d="M 144.22399,249.47657 L 179.49029,178.61943" 54.220 + id="path1915" 54.221 + inkscape:connector-type="polyline" 54.222 + inkscape:connection-start="#rect2863" 54.223 + inkscape:connection-end="#rect1913" /> 54.224 + <path 54.225 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:2, 2;stroke-dashoffset:0;stroke-opacity:1" 54.226 + d="M 222.20966,203.40514 L 196.79033,178.61943" 54.227 + id="path1917" 54.228 + inkscape:connector-type="polyline" 54.229 + inkscape:connection-start="#rect2911" 54.230 + inkscape:connection-end="#rect1913" /> 54.231 + <text 54.232 + xml:space="preserve" 54.233 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 54.234 + x="166.16823" 54.235 + y="168.52228" 54.236 + id="text2806"><tspan 54.237 + sodipodi:role="line" 54.238 + id="tspan2808" 54.239 + x="166.16823" 54.240 + y="168.52228" 54.241 + style="font-family:Courier">fusión</tspan></text> 54.242 + <text 54.243 + xml:space="preserve" 54.244 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 54.245 + x="246" 54.246 + y="162.63338" 54.247 + id="text2810"><tspan 54.248 + sodipodi:role="line" 54.249 + x="246" 54.250 + y="162.63338" 54.251 + id="tspan2814">directorio de trabajo</tspan><tspan 54.252 + sodipodi:role="line" 54.253 + x="246" 54.254 + y="177.63338" 54.255 + id="tspan3538">durante la fusión</tspan></text> 54.256 + <rect 54.257 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 54.258 + id="rect2816" 54.259 + width="94.285713" 54.260 + height="20.714285" 54.261 + x="483.14636" 54.262 + y="297.76227" /> 54.263 + <text 54.264 + xml:space="preserve" 54.265 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 54.266 + x="507.24527" 54.267 + y="311.38342" 54.268 + id="text2818"><tspan 54.269 + sodipodi:role="line" 54.270 + id="tspan2820" 54.271 + x="507.24527" 54.272 + y="311.38342" 54.273 + style="font-family:Courier"><tspan 54.274 + style="font-weight:bold" 54.275 + id="tspan2822">4</tspan>: REV4</tspan></text> 54.276 + <path 54.277 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 54.278 + d="M 530.28921,343.6373 L 530.28921,319.47655" 54.279 + id="path2824" 54.280 + inkscape:connector-type="polyline" /> 54.281 + <rect 54.282 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 54.283 + id="rect2826" 54.284 + width="94.285713" 54.285 + height="20.714285" 54.286 + x="436.57492" 54.287 + y="250.47656" /> 54.288 + <text 54.289 + xml:space="preserve" 54.290 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 54.291 + x="461.24484" 54.292 + y="264.56613" 54.293 + id="text2828" 54.294 + transform="scale(1.000002,0.999998)"><tspan 54.295 + sodipodi:role="line" 54.296 + id="tspan2830" 54.297 + x="461.24484" 54.298 + y="264.56613" 54.299 + style="font-family:Courier"><tspan 54.300 + style="font-weight:bold" 54.301 + id="tspan2832">5</tspan>: REV_my_new_hello</tspan></text> 54.302 + <path 54.303 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 54.304 + d="M 519.10362,296.76227 L 494.90337,272.19084" 54.305 + id="path2834" 54.306 + inkscape:connector-type="polyline" /> 54.307 + <rect 54.308 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 54.309 + id="rect2836" 54.310 + width="94.285995" 54.311 + height="20.714283" 54.312 + x="483.14001" 54.313 + y="156.548" /> 54.314 + <text 54.315 + xml:space="preserve" 54.316 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 54.317 + x="555.95911" 54.318 + y="218.02698" 54.319 + id="text2838" 54.320 + transform="scale(1.000002,0.999998)"><tspan 54.321 + sodipodi:role="line" 54.322 + id="tspan2840" 54.323 + x="555.95911" 54.324 + y="218.02698" 54.325 + style="font-family:Courier"><tspan 54.326 + id="tspan2842" 54.327 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 54.328 + <path 54.329 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 54.330 + d="M 536.21543,296.76227 L 574.03453,224.76218" 54.331 + id="path2844" 54.332 + inkscape:connector-type="polyline" /> 54.333 + <text 54.334 + xml:space="preserve" 54.335 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 54.336 + x="463.11224" 54.337 + y="169.78796" 54.338 + id="text2846"><tspan 54.339 + sodipodi:role="line" 54.340 + id="tspan2848" 54.341 + x="463.11224" 54.342 + y="169.78796">tip</tspan></text> 54.343 + <path 54.344 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-start:none;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" 54.345 + d="M 489.37034,249.47656 L 524.65575,178.26229" 54.346 + id="path2856" 54.347 + inkscape:connector-type="polyline" 54.348 + inkscape:connection-end="#rect2836" /> 54.349 + <path 54.350 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;display:inline" 54.351 + d="M 567.85714,202.0479 L 542.42591,178.26229" 54.352 + id="path2858" 54.353 + inkscape:connector-type="polyline" 54.354 + inkscape:connection-end="#rect2836" 54.355 + inkscape:connection-start="#rect2995" /> 54.356 + <text 54.357 + xml:space="preserve" 54.358 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 54.359 + x="490.40295" 54.360 + y="170.39714" 54.361 + id="text2860"><tspan 54.362 + sodipodi:role="line" 54.363 + id="tspan2863" 54.364 + x="490.40295" 54.365 + y="170.39714" 54.366 + style="font-family:Courier"><tspan 54.367 + style="font-weight:bold" 54.368 + id="tspan2997">7</tspan>: REV7_my_new_hello</tspan></text> 54.369 + <text 54.370 + xml:space="preserve" 54.371 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 54.372 + x="90.323105" 54.373 + y="120.21933" 54.374 + id="text2929"><tspan 54.375 + sodipodi:role="line" 54.376 + id="tspan2931" 54.377 + x="90.323105" 54.378 + y="120.21933" 54.379 + style="font-weight:bold">Directorio de trabajo durante la fusión</tspan></text> 54.380 + <text 54.381 + xml:space="preserve" 54.382 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 54.383 + x="435.35226" 54.384 + y="120.21933" 54.385 + id="text2937"><tspan 54.386 + sodipodi:role="line" 54.387 + id="tspan2939" 54.388 + x="435.35226" 54.389 + y="120.21933" 54.390 + style="font-weight:bold">Repositorio después de consignar la fusión</tspan></text> 54.391 + </g> 54.392 +</svg>
55.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 55.2 +++ b/es/tour-merge-pull.svg Sat Oct 18 07:48:21 2008 -0500 55.3 @@ -0,0 +1,297 @@ 55.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 55.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 55.6 +<svg 55.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 55.8 + xmlns:cc="http://creativecommons.org/ns#" 55.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 55.10 + xmlns:svg="http://www.w3.org/2000/svg" 55.11 + xmlns="http://www.w3.org/2000/svg" 55.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 55.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 55.14 + width="744.09448819" 55.15 + height="1052.3622047" 55.16 + id="svg2" 55.17 + sodipodi:version="0.32" 55.18 + inkscape:version="0.46" 55.19 + sodipodi:docname="tour-merge-pull.svg" 55.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 55.21 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 55.22 + <defs 55.23 + id="defs4"> 55.24 + <inkscape:perspective 55.25 + sodipodi:type="inkscape:persp3d" 55.26 + inkscape:vp_x="0 : 526.18109 : 1" 55.27 + inkscape:vp_y="0 : 1000 : 0" 55.28 + inkscape:vp_z="744.09448 : 526.18109 : 1" 55.29 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 55.30 + id="perspective2979" /> 55.31 + <marker 55.32 + inkscape:stockid="Arrow1Mstart" 55.33 + orient="auto" 55.34 + refY="0.0" 55.35 + refX="0.0" 55.36 + id="Arrow1Mstart" 55.37 + style="overflow:visible"> 55.38 + <path 55.39 + id="path2973" 55.40 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 55.41 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 55.42 + transform="scale(0.4) translate(10,0)" /> 55.43 + </marker> 55.44 + <marker 55.45 + inkscape:stockid="Arrow1Mend" 55.46 + orient="auto" 55.47 + refY="0.0" 55.48 + refX="0.0" 55.49 + id="Arrow1Mend" 55.50 + style="overflow:visible;"> 55.51 + <path 55.52 + id="path3066" 55.53 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 55.54 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 55.55 + transform="scale(0.4) rotate(180) translate(10,0)" /> 55.56 + </marker> 55.57 + </defs> 55.58 + <sodipodi:namedview 55.59 + id="base" 55.60 + pagecolor="#ffffff" 55.61 + bordercolor="#666666" 55.62 + borderopacity="1.0" 55.63 + gridtolerance="10000" 55.64 + guidetolerance="10" 55.65 + objecttolerance="10" 55.66 + inkscape:pageopacity="0.0" 55.67 + inkscape:pageshadow="2" 55.68 + inkscape:zoom="1.4" 55.69 + inkscape:cx="233.63208" 55.70 + inkscape:cy="704.83702" 55.71 + inkscape:document-units="px" 55.72 + inkscape:current-layer="layer1" 55.73 + inkscape:window-width="906" 55.74 + inkscape:window-height="659" 55.75 + inkscape:window-x="237" 55.76 + inkscape:window-y="103" 55.77 + showgrid="false" /> 55.78 + <metadata 55.79 + id="metadata7"> 55.80 + <rdf:RDF> 55.81 + <cc:Work 55.82 + rdf:about=""> 55.83 + <dc:format>image/svg+xml</dc:format> 55.84 + <dc:type 55.85 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 55.86 + </cc:Work> 55.87 + </rdf:RDF> 55.88 + </metadata> 55.89 + <g 55.90 + inkscape:label="Layer 1" 55.91 + inkscape:groupmode="layer" 55.92 + id="layer1"> 55.93 + <text 55.94 + xml:space="preserve" 55.95 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 55.96 + x="173.57143" 55.97 + y="443.79074" 55.98 + id="text2832"><tspan 55.99 + sodipodi:role="line" 55.100 + id="tspan2834" 55.101 + x="173.57143" 55.102 + y="443.79074" /></text> 55.103 + <rect 55.104 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 55.105 + id="rect1878" 55.106 + width="94.285713" 55.107 + height="20.714285" 55.108 + x="138" 55.109 + y="479.50504" /> 55.110 + <text 55.111 + xml:space="preserve" 55.112 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 55.113 + x="162.09892" 55.114 + y="493.12619" 55.115 + id="text1872"><tspan 55.116 + sodipodi:role="line" 55.117 + id="tspan1874" 55.118 + x="162.09892" 55.119 + y="493.12619" 55.120 + style="font-family:Courier"><tspan 55.121 + style="font-weight:bold" 55.122 + id="tspan1876">0</tspan>: REV0</tspan></text> 55.123 + <rect 55.124 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 55.125 + id="rect2800" 55.126 + width="94.285713" 55.127 + height="20.714285" 55.128 + x="138" 55.129 + y="432.63004" /> 55.130 + <text 55.131 + xml:space="preserve" 55.132 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 55.133 + x="162.09892" 55.134 + y="446.25119" 55.135 + id="text2794"><tspan 55.136 + sodipodi:role="line" 55.137 + id="tspan2796" 55.138 + x="162.09892" 55.139 + y="446.25119" 55.140 + style="font-family:Courier"><tspan 55.141 + id="tspan2868" 55.142 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 55.143 + <rect 55.144 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 55.145 + id="rect2810" 55.146 + width="94.285713" 55.147 + height="20.714285" 55.148 + x="138" 55.149 + y="385.75504" /> 55.150 + <text 55.151 + xml:space="preserve" 55.152 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 55.153 + x="162.09892" 55.154 + y="399.37619" 55.155 + id="text2804"><tspan 55.156 + sodipodi:role="line" 55.157 + id="tspan2806" 55.158 + x="162.09892" 55.159 + y="399.37619" 55.160 + style="font-family:Courier"><tspan 55.161 + style="font-weight:bold" 55.162 + id="tspan2866">2</tspan>: REV2</tspan></text> 55.163 + <rect 55.164 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 55.165 + id="rect2820" 55.166 + width="94.285713" 55.167 + height="20.714285" 55.168 + x="138" 55.169 + y="338.88007" /> 55.170 + <text 55.171 + xml:space="preserve" 55.172 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 55.173 + x="162.09892" 55.174 + y="352.50122" 55.175 + id="text2814"><tspan 55.176 + sodipodi:role="line" 55.177 + id="tspan2816" 55.178 + x="162.09892" 55.179 + y="352.50122" 55.180 + style="font-family:Courier"><tspan 55.181 + style="font-weight:bold" 55.182 + id="tspan2864">3</tspan>: REV3</tspan></text> 55.183 + <rect 55.184 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 55.185 + id="rect2830" 55.186 + width="94.285713" 55.187 + height="20.714285" 55.188 + x="138" 55.189 + y="292.00504" /> 55.190 + <text 55.191 + xml:space="preserve" 55.192 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 55.193 + x="162.09892" 55.194 + y="305.62619" 55.195 + id="text2824"><tspan 55.196 + sodipodi:role="line" 55.197 + id="tspan2826" 55.198 + x="162.09892" 55.199 + y="305.62619" 55.200 + style="font-family:Courier"><tspan 55.201 + style="font-weight:bold" 55.202 + id="tspan2862">4</tspan>: REV4</tspan></text> 55.203 + <path 55.204 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 55.205 + d="M 185.14286,478.50504 L 185.14286,454.34432" 55.206 + id="path2894" 55.207 + inkscape:connector-type="polyline" /> 55.208 + <path 55.209 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 55.210 + d="M 185.14286,431.63004 L 185.14286,407.46932" 55.211 + id="path2896" 55.212 + inkscape:connector-type="polyline" /> 55.213 + <path 55.214 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 55.215 + d="M 185.14286,384.75504 L 185.14286,360.59435" 55.216 + id="path2898" 55.217 + inkscape:connector-type="polyline" /> 55.218 + <path 55.219 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 55.220 + d="M 185.14286,337.88007 L 185.14286,313.71932" 55.221 + id="path2900" 55.222 + inkscape:connector-type="polyline" /> 55.223 + <rect 55.224 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 55.225 + id="rect2863" 55.226 + width="94.285713" 55.227 + height="20.714285" 55.228 + x="91.428574" 55.229 + y="244.71933" /> 55.230 + <text 55.231 + xml:space="preserve" 55.232 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 55.233 + x="116.09886" 55.234 + y="258.80865" 55.235 + id="text1965" 55.236 + transform="scale(1.000002,0.999998)"><tspan 55.237 + sodipodi:role="line" 55.238 + id="tspan1967" 55.239 + x="116.09886" 55.240 + y="258.80865" 55.241 + style="font-family:Courier"><tspan 55.242 + style="font-weight:bold" 55.243 + id="tspan1973">5</tspan>: REV_my_new_hello</tspan></text> 55.244 + <path 55.245 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 55.246 + d="M 173.95727,291.00504 L 149.75702,266.43361" 55.247 + id="path1971" 55.248 + inkscape:connector-type="polyline" 55.249 + inkscape:connection-end="#rect2863" 55.250 + inkscape:connection-start="#rect2830" /> 55.251 + <rect 55.252 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 55.253 + id="rect2911" 55.254 + width="94.285995" 55.255 + height="20.714283" 55.256 + x="186.71414" 55.257 + y="198.6479" /> 55.258 + <text 55.259 + xml:space="preserve" 55.260 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 55.261 + x="210.81311" 55.262 + y="212.26949" 55.263 + id="text2913" 55.264 + transform="scale(1.000002,0.999998)"><tspan 55.265 + sodipodi:role="line" 55.266 + id="tspan2915" 55.267 + x="210.81311" 55.268 + y="212.26949" 55.269 + style="font-family:Courier"><tspan 55.270 + id="tspan1966" 55.271 + style="font-weight:bold">6</tspan>: REV6_my_new_hello</tspan></text> 55.272 + <path 55.273 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 55.274 + d="M 191.06908,291.00504 L 227.93092,220.36218" 55.275 + id="path2919" 55.276 + inkscape:connector-type="polyline" 55.277 + inkscape:connection-start="#rect2830" /> 55.278 + <text 55.279 + xml:space="preserve" 55.280 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 55.281 + x="291" 55.282 + y="225.3813" 55.283 + id="text2871"><tspan 55.284 + sodipodi:role="line" 55.285 + id="tspan2873" 55.286 + x="291" 55.287 + y="225.3813">tip (y principal)</tspan></text> 55.288 + <text 55.289 + xml:space="preserve" 55.290 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 55.291 + x="76" 55.292 + y="259.16046" 55.293 + id="text2875"><tspan 55.294 + sodipodi:role="line" 55.295 + id="tspan2877" 55.296 + x="76" 55.297 + y="259.16046" 55.298 + style="text-align:end;text-anchor:end">principal</tspan></text> 55.299 + </g> 55.300 +</svg>
56.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 56.2 +++ b/es/tour-merge-sep-repos.svg Sat Oct 18 07:48:21 2008 -0500 56.3 @@ -0,0 +1,480 @@ 56.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 56.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 56.6 +<svg 56.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 56.8 + xmlns:cc="http://creativecommons.org/ns#" 56.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 56.10 + xmlns:svg="http://www.w3.org/2000/svg" 56.11 + xmlns="http://www.w3.org/2000/svg" 56.12 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 56.13 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 56.14 + width="744.09448819" 56.15 + height="1052.3622047" 56.16 + id="svg2" 56.17 + sodipodi:version="0.32" 56.18 + inkscape:version="0.46" 56.19 + sodipodi:docname="tour-merge-sep-repos.svg" 56.20 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 56.21 + <defs 56.22 + id="defs4"> 56.23 + <inkscape:perspective 56.24 + sodipodi:type="inkscape:persp3d" 56.25 + inkscape:vp_x="0 : 526.18109 : 1" 56.26 + inkscape:vp_y="0 : 1000 : 0" 56.27 + inkscape:vp_z="744.09448 : 526.18109 : 1" 56.28 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 56.29 + id="perspective3067" /> 56.30 + <marker 56.31 + inkscape:stockid="Arrow1Mstart" 56.32 + orient="auto" 56.33 + refY="0.0" 56.34 + refX="0.0" 56.35 + id="Arrow1Mstart" 56.36 + style="overflow:visible"> 56.37 + <path 56.38 + id="path2973" 56.39 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 56.40 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 56.41 + transform="scale(0.4) translate(10,0)" /> 56.42 + </marker> 56.43 + <marker 56.44 + inkscape:stockid="Arrow1Mend" 56.45 + orient="auto" 56.46 + refY="0.0" 56.47 + refX="0.0" 56.48 + id="Arrow1Mend" 56.49 + style="overflow:visible;"> 56.50 + <path 56.51 + id="path3066" 56.52 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 56.53 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 56.54 + transform="scale(0.4) rotate(180) translate(10,0)" /> 56.55 + </marker> 56.56 + </defs> 56.57 + <sodipodi:namedview 56.58 + id="base" 56.59 + pagecolor="#ffffff" 56.60 + bordercolor="#666666" 56.61 + borderopacity="1.0" 56.62 + gridtolerance="10000" 56.63 + guidetolerance="10" 56.64 + objecttolerance="10" 56.65 + inkscape:pageopacity="0.0" 56.66 + inkscape:pageshadow="2" 56.67 + inkscape:zoom="1.4" 56.68 + inkscape:cx="307.20351" 56.69 + inkscape:cy="683.39831" 56.70 + inkscape:document-units="px" 56.71 + inkscape:current-layer="layer1" 56.72 + inkscape:window-width="906" 56.73 + inkscape:window-height="659" 56.74 + inkscape:window-x="5" 56.75 + inkscape:window-y="49" 56.76 + showgrid="false" /> 56.77 + <metadata 56.78 + id="metadata7"> 56.79 + <rdf:RDF> 56.80 + <cc:Work 56.81 + rdf:about=""> 56.82 + <dc:format>image/svg+xml</dc:format> 56.83 + <dc:type 56.84 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 56.85 + </cc:Work> 56.86 + </rdf:RDF> 56.87 + </metadata> 56.88 + <g 56.89 + inkscape:label="Layer 1" 56.90 + inkscape:groupmode="layer" 56.91 + id="layer1"> 56.92 + <text 56.93 + xml:space="preserve" 56.94 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.95 + x="173.57143" 56.96 + y="443.79074" 56.97 + id="text2832"><tspan 56.98 + sodipodi:role="line" 56.99 + id="tspan2834" 56.100 + x="173.57143" 56.101 + y="443.79074" /></text> 56.102 + <rect 56.103 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.104 + id="rect1878" 56.105 + width="94.285713" 56.106 + height="20.714285" 56.107 + x="138" 56.108 + y="479.50504" /> 56.109 + <text 56.110 + xml:space="preserve" 56.111 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.112 + x="162.09892" 56.113 + y="493.12619" 56.114 + id="text1872"><tspan 56.115 + sodipodi:role="line" 56.116 + id="tspan1874" 56.117 + x="162.09892" 56.118 + y="493.12619" 56.119 + style="font-family:Courier"><tspan 56.120 + style="font-weight:bold" 56.121 + id="tspan1876">0</tspan>: REV0</tspan></text> 56.122 + <rect 56.123 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.124 + id="rect2800" 56.125 + width="94.285713" 56.126 + height="20.714285" 56.127 + x="138" 56.128 + y="432.63004" /> 56.129 + <text 56.130 + xml:space="preserve" 56.131 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.132 + x="162.09892" 56.133 + y="446.25119" 56.134 + id="text2794"><tspan 56.135 + sodipodi:role="line" 56.136 + id="tspan2796" 56.137 + x="162.09892" 56.138 + y="446.25119" 56.139 + style="font-family:Courier"><tspan 56.140 + id="tspan2868" 56.141 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 56.142 + <rect 56.143 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.144 + id="rect2810" 56.145 + width="94.285713" 56.146 + height="20.714285" 56.147 + x="138" 56.148 + y="385.75504" /> 56.149 + <text 56.150 + xml:space="preserve" 56.151 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.152 + x="162.09892" 56.153 + y="399.37619" 56.154 + id="text2804"><tspan 56.155 + sodipodi:role="line" 56.156 + id="tspan2806" 56.157 + x="162.09892" 56.158 + y="399.37619" 56.159 + style="font-family:Courier"><tspan 56.160 + style="font-weight:bold" 56.161 + id="tspan2866">2</tspan>: REV2</tspan></text> 56.162 + <rect 56.163 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.164 + id="rect2820" 56.165 + width="94.285713" 56.166 + height="20.714285" 56.167 + x="138" 56.168 + y="338.88007" /> 56.169 + <text 56.170 + xml:space="preserve" 56.171 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.172 + x="162.09892" 56.173 + y="352.50122" 56.174 + id="text2814"><tspan 56.175 + sodipodi:role="line" 56.176 + id="tspan2816" 56.177 + x="162.09892" 56.178 + y="352.50122" 56.179 + style="font-family:Courier"><tspan 56.180 + style="font-weight:bold" 56.181 + id="tspan2864">3</tspan>: REV3</tspan></text> 56.182 + <rect 56.183 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.184 + id="rect2830" 56.185 + width="94.285713" 56.186 + height="20.714285" 56.187 + x="138" 56.188 + y="292.00504" /> 56.189 + <text 56.190 + xml:space="preserve" 56.191 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.192 + x="162.09892" 56.193 + y="305.62619" 56.194 + id="text2824"><tspan 56.195 + sodipodi:role="line" 56.196 + id="tspan2826" 56.197 + x="162.09892" 56.198 + y="305.62619" 56.199 + style="font-family:Courier"><tspan 56.200 + style="font-weight:bold" 56.201 + id="tspan2862">4</tspan>: REV4</tspan></text> 56.202 + <path 56.203 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.204 + d="M 185.14286,478.50504 L 185.14286,454.34432" 56.205 + id="path2894" 56.206 + inkscape:connector-type="polyline" /> 56.207 + <path 56.208 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.209 + d="M 185.14286,431.63004 L 185.14286,407.46932" 56.210 + id="path2896" 56.211 + inkscape:connector-type="polyline" /> 56.212 + <path 56.213 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.214 + d="M 185.14286,384.75504 L 185.14286,360.59435" 56.215 + id="path2898" 56.216 + inkscape:connector-type="polyline" /> 56.217 + <path 56.218 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.219 + d="M 185.14286,337.88007 L 185.14286,313.71932" 56.220 + id="path2900" 56.221 + inkscape:connector-type="polyline" /> 56.222 + <rect 56.223 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.224 + id="rect1963" 56.225 + width="94.285995" 56.226 + height="20.714283" 56.227 + x="138" 56.228 + y="245.18723" /> 56.229 + <text 56.230 + xml:space="preserve" 56.231 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.232 + x="162.09877" 56.233 + y="258.80865" 56.234 + id="text1965" 56.235 + transform="scale(1.000002,0.999998)"><tspan 56.236 + sodipodi:role="line" 56.237 + id="tspan1967" 56.238 + x="162.09877" 56.239 + y="258.80865" 56.240 + style="font-family:Courier"><tspan 56.241 + style="font-weight:bold" 56.242 + id="tspan1973">5</tspan>: REV_my_hello</tspan></text> 56.243 + <path 56.244 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.245 + d="M 185.143,291.06218 L 185.143,266.90143" 56.246 + id="path1971" 56.247 + inkscape:connector-type="polyline" /> 56.248 + <text 56.249 + xml:space="preserve" 56.250 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 56.251 + x="136.90039" 56.252 + y="232.25546" 56.253 + id="text2921"><tspan 56.254 + sodipodi:role="line" 56.255 + id="tspan2923" 56.256 + x="136.90039" 56.257 + y="232.25546">my-hello</tspan></text> 56.258 + <rect 56.259 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.260 + id="rect2863" 56.261 + width="94.285713" 56.262 + height="20.714285" 56.263 + x="370.71414" 56.264 + y="479.49289" /> 56.265 + <text 56.266 + xml:space="preserve" 56.267 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.268 + x="394.81305" 56.269 + y="493.11404" 56.270 + id="text2865"><tspan 56.271 + sodipodi:role="line" 56.272 + id="tspan2867" 56.273 + x="394.81305" 56.274 + y="493.11404" 56.275 + style="font-family:Courier"><tspan 56.276 + style="font-weight:bold" 56.277 + id="tspan2869">0</tspan>: REV0</tspan></text> 56.278 + <rect 56.279 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.280 + id="rect2871" 56.281 + width="94.285713" 56.282 + height="20.714285" 56.283 + x="370.71414" 56.284 + y="432.61789" /> 56.285 + <text 56.286 + xml:space="preserve" 56.287 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.288 + x="394.81305" 56.289 + y="446.23904" 56.290 + id="text2873"><tspan 56.291 + sodipodi:role="line" 56.292 + id="tspan2875" 56.293 + x="394.81305" 56.294 + y="446.23904" 56.295 + style="font-family:Courier"><tspan 56.296 + id="tspan2877" 56.297 + style="font-weight:bold">1</tspan>: REV1</tspan></text> 56.298 + <rect 56.299 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.300 + id="rect2879" 56.301 + width="94.285713" 56.302 + height="20.714285" 56.303 + x="370.71414" 56.304 + y="385.74289" /> 56.305 + <text 56.306 + xml:space="preserve" 56.307 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.308 + x="394.81305" 56.309 + y="399.36404" 56.310 + id="text2881"><tspan 56.311 + sodipodi:role="line" 56.312 + id="tspan2883" 56.313 + x="394.81305" 56.314 + y="399.36404" 56.315 + style="font-family:Courier"><tspan 56.316 + style="font-weight:bold" 56.317 + id="tspan2885">2</tspan>: REV2</tspan></text> 56.318 + <rect 56.319 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.320 + id="rect2887" 56.321 + width="94.285713" 56.322 + height="20.714285" 56.323 + x="370.71414" 56.324 + y="338.86792" /> 56.325 + <text 56.326 + xml:space="preserve" 56.327 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.328 + x="394.81305" 56.329 + y="352.48907" 56.330 + id="text2889"><tspan 56.331 + sodipodi:role="line" 56.332 + id="tspan2891" 56.333 + x="394.81305" 56.334 + y="352.48907" 56.335 + style="font-family:Courier"><tspan 56.336 + style="font-weight:bold" 56.337 + id="tspan2893">3</tspan>: REV3</tspan></text> 56.338 + <rect 56.339 + style="fill:#a5c3c8;fill-opacity:1;stroke:#6396a0;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.340 + id="rect2895" 56.341 + width="94.285713" 56.342 + height="20.714285" 56.343 + x="370.71414" 56.344 + y="291.99289" /> 56.345 + <text 56.346 + xml:space="preserve" 56.347 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.348 + x="394.81305" 56.349 + y="305.61404" 56.350 + id="text2897"><tspan 56.351 + sodipodi:role="line" 56.352 + id="tspan2899" 56.353 + x="394.81305" 56.354 + y="305.61404" 56.355 + style="font-family:Courier"><tspan 56.356 + style="font-weight:bold" 56.357 + id="tspan2901">4</tspan>: REV4</tspan></text> 56.358 + <path 56.359 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.360 + d="M 417.85701,478.4929 L 417.85701,454.33218" 56.361 + id="path2903" 56.362 + inkscape:connector-type="polyline" /> 56.363 + <path 56.364 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.365 + d="M 417.85701,431.6179 L 417.85701,407.45718" 56.366 + id="path2905" 56.367 + inkscape:connector-type="polyline" /> 56.368 + <path 56.369 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.370 + d="M 417.85701,384.7429 L 417.85701,360.58221" 56.371 + id="path2907" 56.372 + inkscape:connector-type="polyline" /> 56.373 + <path 56.374 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.375 + d="M 417.85701,337.86793 L 417.85701,313.70718" 56.376 + id="path2909" 56.377 + inkscape:connector-type="polyline" /> 56.378 + <rect 56.379 + style="fill:#78a5ad;fill-opacity:1;stroke:#507b84;stroke-width:2.00000286;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.380 + id="rect2911" 56.381 + width="94.285995" 56.382 + height="20.714283" 56.383 + x="370.71414" 56.384 + y="245.17511" /> 56.385 + <text 56.386 + xml:space="preserve" 56.387 + style="font-size:12.00001812px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Courier" 56.388 + x="394.81274" 56.389 + y="258.79678" 56.390 + id="text2913" 56.391 + transform="scale(1.000002,0.999998)"><tspan 56.392 + sodipodi:role="line" 56.393 + id="tspan2915" 56.394 + x="394.81274" 56.395 + y="258.79678" 56.396 + style="font-family:Courier"><tspan 56.397 + style="font-weight:bold" 56.398 + id="tspan2917">5</tspan>: REV_my_new_hello</tspan></text> 56.399 + <path 56.400 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.00000143px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 56.401 + d="M 417.85715,291.05004 L 417.85715,266.88929" 56.402 + id="path2919" 56.403 + inkscape:connector-type="polyline" /> 56.404 + <text 56.405 + xml:space="preserve" 56.406 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 56.407 + x="369.61453" 56.408 + y="232.25546" 56.409 + id="text2925"><tspan 56.410 + sodipodi:role="line" 56.411 + id="tspan2927" 56.412 + x="369.61453" 56.413 + y="232.25546">my-new-hello</tspan></text> 56.414 + <text 56.415 + xml:space="preserve" 56.416 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 56.417 + x="300.54352" 56.418 + y="252.12723" 56.419 + id="text2933"><tspan 56.420 + sodipodi:role="line" 56.421 + id="tspan2935" 56.422 + x="300.54352" 56.423 + y="252.12723" 56.424 + style="text-align:center;text-anchor:middle">Los cambios</tspan><tspan 56.425 + sodipodi:role="line" 56.426 + x="300.54352" 56.427 + y="267.12723" 56.428 + style="text-align:center;text-anchor:middle" 56.429 + id="tspan3494">más recientes</tspan><tspan 56.430 + sodipodi:role="line" 56.431 + x="300.54352" 56.432 + y="282.12723" 56.433 + style="text-align:center;text-anchor:middle" 56.434 + id="tspan3132">difieren</tspan></text> 56.435 + <text 56.436 + xml:space="preserve" 56.437 + style="font-size:12px;font-style:normal;font-weight:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 56.438 + x="262.15436" 56.439 + y="398.37112" 56.440 + id="text2929"><tspan 56.441 + sodipodi:role="line" 56.442 + x="262.15436" 56.443 + y="398.37112" 56.444 + id="tspan3013" 56.445 + style="text-align:start;text-anchor:start">historia común</tspan></text> 56.446 + <g 56.447 + id="g3107" 56.448 + transform="translate(0,0.855744)"> 56.449 + <path 56.450 + id="path3101" 56.451 + d="M 300.35713,381.29075 L 300.35713,304.50504" 56.452 + style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" /> 56.453 + <path 56.454 + id="path3105" 56.455 + d="M 291.07142,301.64789 L 309.28571,301.64789" 56.456 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> 56.457 + </g> 56.458 + <path 56.459 + style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:4, 4;stroke-dashoffset:0;stroke-opacity:1" 56.460 + d="M 300.53571,486.38926 L 300.53571,409.60355" 56.461 + id="path3113" /> 56.462 + <path 56.463 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#bfbfbf;stroke-width:0.60000002;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 56.464 + d="M 291.25,488.49641 L 309.46429,488.49641" 56.465 + id="path3115" /> 56.466 + <text 56.467 + xml:space="preserve" 56.468 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 56.469 + x="480.71429" 56.470 + y="250.91507" 56.471 + id="text1949"><tspan 56.472 + sodipodi:role="line" 56.473 + id="tspan1951" 56.474 + x="480.71429" 56.475 + y="250.91507" 56.476 + style="text-align:start;text-anchor:start">revisión principal</tspan><tspan 56.477 + sodipodi:role="line" 56.478 + x="480.71429" 56.479 + y="265.91507" 56.480 + id="tspan1953" 56.481 + style="text-align:start;text-anchor:start"> (sin hijos)</tspan></text> 56.482 + </g> 56.483 +</svg>
57.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 57.2 +++ b/es/wdir-after-commit.svg Sat Oct 18 07:48:21 2008 -0500 57.3 @@ -0,0 +1,413 @@ 57.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 57.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 57.6 +<svg 57.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 57.8 + xmlns:cc="http://creativecommons.org/ns#" 57.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 57.10 + xmlns:svg="http://www.w3.org/2000/svg" 57.11 + xmlns="http://www.w3.org/2000/svg" 57.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 57.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 57.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 57.15 + width="744.09448819" 57.16 + height="1052.3622047" 57.17 + id="svg5971" 57.18 + sodipodi:version="0.32" 57.19 + inkscape:version="0.46" 57.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 57.21 + sodipodi:docname="wdir-after-commit.svg" 57.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 57.23 + <defs 57.24 + id="defs5973"> 57.25 + <inkscape:perspective 57.26 + sodipodi:type="inkscape:persp3d" 57.27 + inkscape:vp_x="0 : 526.18109 : 1" 57.28 + inkscape:vp_y="0 : 1000 : 0" 57.29 + inkscape:vp_z="744.09448 : 526.18109 : 1" 57.30 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 57.31 + id="perspective3128" /> 57.32 + <linearGradient 57.33 + inkscape:collect="always" 57.34 + xlink:href="#linearGradient6049" 57.35 + id="linearGradient6445" 57.36 + gradientUnits="userSpaceOnUse" 57.37 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 57.38 + x1="333.91171" 57.39 + y1="488.79077" 57.40 + x2="508.94543" 57.41 + y2="263.79077" /> 57.42 + <marker 57.43 + inkscape:stockid="Arrow1Mstart" 57.44 + orient="auto" 57.45 + refY="0.0" 57.46 + refX="0.0" 57.47 + id="Arrow1Mstart" 57.48 + style="overflow:visible"> 57.49 + <path 57.50 + id="path4855" 57.51 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 57.52 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 57.53 + transform="scale(0.4) translate(10,0)" /> 57.54 + </marker> 57.55 + <linearGradient 57.56 + id="linearGradient6049"> 57.57 + <stop 57.58 + style="stop-color:#686868;stop-opacity:1;" 57.59 + offset="0" 57.60 + id="stop6051" /> 57.61 + <stop 57.62 + style="stop-color:#f0f0f0;stop-opacity:1;" 57.63 + offset="1" 57.64 + id="stop6053" /> 57.65 + </linearGradient> 57.66 + <marker 57.67 + inkscape:stockid="Arrow1Mend" 57.68 + orient="auto" 57.69 + refY="0.0" 57.70 + refX="0.0" 57.71 + id="Arrow1Mend" 57.72 + style="overflow:visible;"> 57.73 + <path 57.74 + id="path4852" 57.75 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 57.76 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 57.77 + transform="scale(0.4) rotate(180) translate(10,0)" /> 57.78 + </marker> 57.79 + <linearGradient 57.80 + inkscape:collect="always" 57.81 + xlink:href="#linearGradient6049" 57.82 + id="linearGradient6083" 57.83 + gradientUnits="userSpaceOnUse" 57.84 + gradientTransform="translate(-240.0462,-8.633237e-6)" 57.85 + x1="333.91171" 57.86 + y1="488.79077" 57.87 + x2="508.94543" 57.88 + y2="263.79077" /> 57.89 + <linearGradient 57.90 + inkscape:collect="always" 57.91 + xlink:href="#linearGradient6049" 57.92 + id="linearGradient6142" 57.93 + gradientUnits="userSpaceOnUse" 57.94 + gradientTransform="translate(-42.00893,-30.49544)" 57.95 + x1="333.91171" 57.96 + y1="488.79077" 57.97 + x2="508.94543" 57.98 + y2="263.79077" /> 57.99 + <linearGradient 57.100 + inkscape:collect="always" 57.101 + xlink:href="#linearGradient6049" 57.102 + id="linearGradient6193" 57.103 + gradientUnits="userSpaceOnUse" 57.104 + gradientTransform="translate(-240.0462,-8.633237e-6)" 57.105 + x1="333.91171" 57.106 + y1="488.79077" 57.107 + x2="508.94543" 57.108 + y2="263.79077" /> 57.109 + <linearGradient 57.110 + inkscape:collect="always" 57.111 + xlink:href="#linearGradient6049" 57.112 + id="linearGradient6216" 57.113 + gradientUnits="userSpaceOnUse" 57.114 + gradientTransform="translate(-6.0462,-0.664361)" 57.115 + x1="333.91171" 57.116 + y1="488.79077" 57.117 + x2="508.94543" 57.118 + y2="263.79077" /> 57.119 + <linearGradient 57.120 + inkscape:collect="always" 57.121 + xlink:href="#linearGradient6049" 57.122 + id="linearGradient6232" 57.123 + gradientUnits="userSpaceOnUse" 57.124 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 57.125 + x1="333.91171" 57.126 + y1="488.79077" 57.127 + x2="508.94543" 57.128 + y2="263.79077" /> 57.129 + <linearGradient 57.130 + inkscape:collect="always" 57.131 + xlink:href="#linearGradient6049" 57.132 + id="linearGradient6772" 57.133 + gradientUnits="userSpaceOnUse" 57.134 + gradientTransform="matrix(1.000474,0,0,0.790947,222.8399,50.85693)" 57.135 + x1="333.91171" 57.136 + y1="488.79077" 57.137 + x2="508.94543" 57.138 + y2="263.79077" /> 57.139 + </defs> 57.140 + <sodipodi:namedview 57.141 + id="base" 57.142 + pagecolor="#ffffff" 57.143 + bordercolor="#666666" 57.144 + borderopacity="1.0" 57.145 + gridtolerance="10000" 57.146 + guidetolerance="10" 57.147 + objecttolerance="10" 57.148 + inkscape:pageopacity="0.0" 57.149 + inkscape:pageshadow="2" 57.150 + inkscape:zoom="0.90509668" 57.151 + inkscape:cx="390.0539" 57.152 + inkscape:cy="602.10507" 57.153 + inkscape:document-units="px" 57.154 + inkscape:current-layer="layer1" 57.155 + showguides="true" 57.156 + inkscape:guide-bbox="true" 57.157 + inkscape:window-width="906" 57.158 + inkscape:window-height="659" 57.159 + inkscape:window-x="11" 57.160 + inkscape:window-y="8" 57.161 + showgrid="false"> 57.162 + <sodipodi:guide 57.163 + orientation="vertical" 57.164 + position="-1.4285714" 57.165 + id="guide6022" /> 57.166 + </sodipodi:namedview> 57.167 + <metadata 57.168 + id="metadata5976"> 57.169 + <rdf:RDF> 57.170 + <cc:Work 57.171 + rdf:about=""> 57.172 + <dc:format>image/svg+xml</dc:format> 57.173 + <dc:type 57.174 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 57.175 + </cc:Work> 57.176 + </rdf:RDF> 57.177 + </metadata> 57.178 + <g 57.179 + inkscape:label="Layer 1" 57.180 + inkscape:groupmode="layer" 57.181 + id="layer1"> 57.182 + <rect 57.183 + y="245.98355" 57.184 + x="328.23956" 57.185 + height="258.57144" 57.186 + width="174.28572" 57.187 + id="rect6047" 57.188 + style="fill:url(#linearGradient6216);fill-opacity:1;stroke:#686868;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 57.189 + <g 57.190 + id="g6261" 57.191 + transform="translate(234,0)"> 57.192 + <rect 57.193 + y="258.7149" 57.194 + x="114.11369" 57.195 + height="44.537449" 57.196 + width="134.53746" 57.197 + id="rect5983" 57.198 + style="fill:#b1b1b1;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 57.199 + <text 57.200 + id="text5985" 57.201 + y="284.47562" 57.202 + x="138.7962" 57.203 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.204 + xml:space="preserve"><tspan 57.205 + style="font-family:Courier" 57.206 + y="284.47562" 57.207 + x="138.7962" 57.208 + id="tspan5987" 57.209 + sodipodi:role="line">dfbbb33f3fa3</tspan></text> 57.210 + </g> 57.211 + <rect 57.212 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 57.213 + id="rect5996" 57.214 + width="134.53746" 57.215 + height="44.537449" 57.216 + x="348.11371" 57.217 + y="320.38159" /> 57.218 + <text 57.219 + xml:space="preserve" 57.220 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.221 + x="372.7962" 57.222 + y="346.1423" 57.223 + id="text5998"><tspan 57.224 + sodipodi:role="line" 57.225 + id="tspan6000" 57.226 + x="372.7962" 57.227 + y="346.1423" 57.228 + style="font-family:Courier">e7639888bb2f</tspan></text> 57.229 + <rect 57.230 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 57.231 + id="rect6004" 57.232 + width="134.53746" 57.233 + height="44.537449" 57.234 + x="348.11371" 57.235 + y="382.04825" /> 57.236 + <text 57.237 + xml:space="preserve" 57.238 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.239 + x="370.65421" 57.240 + y="407.80896" 57.241 + id="text6006"><tspan 57.242 + sodipodi:role="line" 57.243 + id="tspan6008" 57.244 + x="370.65421" 57.245 + y="407.80896" 57.246 + style="font-family:Courier">7b064d8bac5e</tspan></text> 57.247 + <path 57.248 + inkscape:connector-type="polyline" 57.249 + id="path6018" 57.250 + d="M 415.38242,303.62646 L 415.38242,320.00744" 57.251 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 57.252 + <path 57.253 + inkscape:connection-end="#rect6004" 57.254 + inkscape:connector-type="polyline" 57.255 + id="path6020" 57.256 + d="M 415.38242,365.29315 L 415.38243,381.67412" 57.257 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 57.258 + <rect 57.259 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 57.260 + id="rect6039" 57.261 + width="134.53746" 57.262 + height="44.537449" 57.263 + x="348.11359" 57.264 + y="443.71487" /> 57.265 + <text 57.266 + xml:space="preserve" 57.267 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.268 + x="372.79706" 57.269 + y="469.47556" 57.270 + id="text6041"><tspan 57.271 + sodipodi:role="line" 57.272 + id="tspan6043" 57.273 + x="372.79706" 57.274 + y="469.47556" 57.275 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 57.276 + <path 57.277 + inkscape:connection-end="#rect6039" 57.278 + inkscape:connector-type="polyline" 57.279 + id="path6045" 57.280 + d="M 415.38238,426.95981 L 415.38235,443.34087" 57.281 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 57.282 + <text 57.283 + xml:space="preserve" 57.284 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.285 + x="327.66046" 57.286 + y="231.36218" 57.287 + id="text6102"><tspan 57.288 + sodipodi:role="line" 57.289 + id="tspan6104" 57.290 + x="327.66046" 57.291 + y="231.36218">Historia en el repositorio</tspan></text> 57.292 + <rect 57.293 + y="245.94225" 57.294 + x="557.28418" 57.295 + height="204.51619" 57.296 + width="174.36833" 57.297 + id="rect6140" 57.298 + style="fill:url(#linearGradient6232);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 57.299 + <g 57.300 + id="g6130" 57.301 + transform="translate(262.3254,24.38544)"> 57.302 + <rect 57.303 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 57.304 + id="rect6106" 57.305 + width="134.53746" 57.306 + height="44.537449" 57.307 + x="314.87415" 57.308 + y="257.95059" /> 57.309 + <text 57.310 + xml:space="preserve" 57.311 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.312 + x="339.55664" 57.313 + y="283.7113" 57.314 + id="text6108"><tspan 57.315 + sodipodi:role="line" 57.316 + id="tspan6110" 57.317 + x="339.55664" 57.318 + y="283.7113" 57.319 + style="font-family:Courier">dfbbb33f3fa3</tspan></text> 57.320 + </g> 57.321 + <g 57.322 + id="g6135" 57.323 + transform="translate(263.0396,49.83106)"> 57.324 + <rect 57.325 + inkscape:transform-center-y="102.85714" 57.326 + inkscape:transform-center-x="129.28571" 57.327 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 57.328 + id="rect6112" 57.329 + width="134.53746" 57.330 + height="44.537449" 57.331 + x="314.15985" 57.332 + y="326.52203" /> 57.333 + <text 57.334 + inkscape:transform-center-y="102.7311" 57.335 + inkscape:transform-center-x="128.69672" 57.336 + xml:space="preserve" 57.337 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.338 + x="338.84335" 57.339 + y="352.28271" 57.340 + id="text6114"><tspan 57.341 + sodipodi:role="line" 57.342 + id="tspan6116" 57.343 + x="338.84335" 57.344 + y="352.28271" 57.345 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 57.346 + </g> 57.347 + <text 57.348 + xml:space="preserve" 57.349 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.350 + x="576.63208" 57.351 + y="270.479" 57.352 + id="text6118"><tspan 57.353 + sodipodi:role="line" 57.354 + id="tspan6120" 57.355 + x="576.63208" 57.356 + y="270.479">Primer padre</tspan></text> 57.357 + <text 57.358 + xml:space="preserve" 57.359 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.360 + x="576.07544" 57.361 + y="364.49615" 57.362 + id="text6122"><tspan 57.363 + sodipodi:role="line" 57.364 + id="tspan6124" 57.365 + x="576.07544" 57.366 + y="364.49615">Segundo padre</tspan></text> 57.367 + <text 57.368 + xml:space="preserve" 57.369 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.370 + x="556.61743" 57.371 + y="231.36218" 57.372 + id="text6195"><tspan 57.373 + sodipodi:role="line" 57.374 + id="tspan6197" 57.375 + x="556.61743" 57.376 + y="231.36218">Padres del directorio de trabajo</tspan></text> 57.377 + <path 57.378 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" 57.379 + d="M 576.82542,297.63008 L 483.02528,287.95831" 57.380 + id="path6266" 57.381 + inkscape:connector-type="polyline" 57.382 + inkscape:connection-start="#g6130" 57.383 + inkscape:connection-end="#g6261" /> 57.384 + <path 57.385 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 57.386 + d="M 665.12232,418.17579 L 665.12232,418.17579" 57.387 + id="path6270" 57.388 + inkscape:connector-type="polyline" /> 57.389 + <text 57.390 + xml:space="preserve" 57.391 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 57.392 + x="316.86407" 57.393 + y="275.6496" 57.394 + id="text6573"><tspan 57.395 + sodipodi:role="line" 57.396 + id="tspan6575" 57.397 + x="316.86407" 57.398 + y="275.6496" 57.399 + style="text-align:end;text-anchor:end">Nuevo</tspan><tspan 57.400 + sodipodi:role="line" 57.401 + x="316.86407" 57.402 + y="290.6496" 57.403 + id="tspan6577" 57.404 + style="text-align:end;text-anchor:end">conjunto</tspan><tspan 57.405 + sodipodi:role="line" 57.406 + x="316.86407" 57.407 + y="305.6496" 57.408 + style="text-align:end;text-anchor:end" 57.409 + id="tspan3470">de</tspan><tspan 57.410 + sodipodi:role="line" 57.411 + x="316.86407" 57.412 + y="320.6496" 57.413 + style="text-align:end;text-anchor:end" 57.414 + id="tspan3472">cambios</tspan></text> 57.415 + </g> 57.416 +</svg>
58.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 58.2 +++ b/es/wdir-branch.svg Sat Oct 18 07:48:21 2008 -0500 58.3 @@ -0,0 +1,427 @@ 58.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 58.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 58.6 +<svg 58.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 58.8 + xmlns:cc="http://creativecommons.org/ns#" 58.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 58.10 + xmlns:svg="http://www.w3.org/2000/svg" 58.11 + xmlns="http://www.w3.org/2000/svg" 58.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 58.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 58.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 58.15 + width="744.09448819" 58.16 + height="1052.3622047" 58.17 + id="svg5971" 58.18 + sodipodi:version="0.32" 58.19 + inkscape:version="0.46" 58.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 58.21 + sodipodi:docname="wdir-branch.svg" 58.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 58.23 + <defs 58.24 + id="defs5973"> 58.25 + <inkscape:perspective 58.26 + sodipodi:type="inkscape:persp3d" 58.27 + inkscape:vp_x="0 : 526.18109 : 1" 58.28 + inkscape:vp_y="0 : 1000 : 0" 58.29 + inkscape:vp_z="744.09448 : 526.18109 : 1" 58.30 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 58.31 + id="perspective3193" /> 58.32 + <marker 58.33 + inkscape:stockid="Arrow1Mstart" 58.34 + orient="auto" 58.35 + refY="0.0" 58.36 + refX="0.0" 58.37 + id="Arrow1Mstart" 58.38 + style="overflow:visible"> 58.39 + <path 58.40 + id="path4855" 58.41 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 58.42 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 58.43 + transform="scale(0.4) translate(10,0)" /> 58.44 + </marker> 58.45 + <linearGradient 58.46 + id="linearGradient6049"> 58.47 + <stop 58.48 + style="stop-color:#686868;stop-opacity:1;" 58.49 + offset="0" 58.50 + id="stop6051" /> 58.51 + <stop 58.52 + style="stop-color:#f0f0f0;stop-opacity:1;" 58.53 + offset="1" 58.54 + id="stop6053" /> 58.55 + </linearGradient> 58.56 + <marker 58.57 + inkscape:stockid="Arrow1Mend" 58.58 + orient="auto" 58.59 + refY="0.0" 58.60 + refX="0.0" 58.61 + id="Arrow1Mend" 58.62 + style="overflow:visible;"> 58.63 + <path 58.64 + id="path4852" 58.65 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 58.66 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 58.67 + transform="scale(0.4) rotate(180) translate(10,0)" /> 58.68 + </marker> 58.69 + <linearGradient 58.70 + inkscape:collect="always" 58.71 + xlink:href="#linearGradient6049" 58.72 + id="linearGradient6083" 58.73 + gradientUnits="userSpaceOnUse" 58.74 + gradientTransform="translate(-240.0462,-8.633237e-6)" 58.75 + x1="333.91171" 58.76 + y1="488.79077" 58.77 + x2="508.94543" 58.78 + y2="263.79077" /> 58.79 + <linearGradient 58.80 + inkscape:collect="always" 58.81 + xlink:href="#linearGradient6049" 58.82 + id="linearGradient6142" 58.83 + gradientUnits="userSpaceOnUse" 58.84 + gradientTransform="translate(-42.00893,-30.49544)" 58.85 + x1="333.91171" 58.86 + y1="488.79077" 58.87 + x2="508.94543" 58.88 + y2="263.79077" /> 58.89 + <linearGradient 58.90 + inkscape:collect="always" 58.91 + xlink:href="#linearGradient6049" 58.92 + id="linearGradient6193" 58.93 + gradientUnits="userSpaceOnUse" 58.94 + gradientTransform="translate(-240.0462,-8.633237e-6)" 58.95 + x1="333.91171" 58.96 + y1="488.79077" 58.97 + x2="508.94543" 58.98 + y2="263.79077" /> 58.99 + <linearGradient 58.100 + inkscape:collect="always" 58.101 + xlink:href="#linearGradient6049" 58.102 + id="linearGradient6216" 58.103 + gradientUnits="userSpaceOnUse" 58.104 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 58.105 + x1="333.91171" 58.106 + y1="488.79077" 58.107 + x2="508.94543" 58.108 + y2="263.79077" /> 58.109 + <linearGradient 58.110 + inkscape:collect="always" 58.111 + xlink:href="#linearGradient6049" 58.112 + id="linearGradient6232" 58.113 + gradientUnits="userSpaceOnUse" 58.114 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 58.115 + x1="333.91171" 58.116 + y1="488.79077" 58.117 + x2="508.94543" 58.118 + y2="263.79077" /> 58.119 + <linearGradient 58.120 + inkscape:collect="always" 58.121 + xlink:href="#linearGradient6049" 58.122 + id="linearGradient6445" 58.123 + gradientUnits="userSpaceOnUse" 58.124 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 58.125 + x1="333.91171" 58.126 + y1="488.79077" 58.127 + x2="508.94543" 58.128 + y2="263.79077" /> 58.129 + <linearGradient 58.130 + inkscape:collect="always" 58.131 + xlink:href="#linearGradient6049" 58.132 + id="linearGradient6974" 58.133 + gradientUnits="userSpaceOnUse" 58.134 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 58.135 + x1="333.91171" 58.136 + y1="488.79077" 58.137 + x2="508.94543" 58.138 + y2="263.79077" /> 58.139 + <linearGradient 58.140 + inkscape:collect="always" 58.141 + xlink:href="#linearGradient6049" 58.142 + id="linearGradient6996" 58.143 + gradientUnits="userSpaceOnUse" 58.144 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 58.145 + x1="333.91171" 58.146 + y1="488.79077" 58.147 + x2="508.94543" 58.148 + y2="263.79077" /> 58.149 + </defs> 58.150 + <sodipodi:namedview 58.151 + id="base" 58.152 + pagecolor="#ffffff" 58.153 + bordercolor="#666666" 58.154 + borderopacity="1.0" 58.155 + gridtolerance="10000" 58.156 + guidetolerance="10" 58.157 + objecttolerance="10" 58.158 + inkscape:pageopacity="0.0" 58.159 + inkscape:pageshadow="2" 58.160 + inkscape:zoom="0.90509668" 58.161 + inkscape:cx="345.85973" 58.162 + inkscape:cy="690.49342" 58.163 + inkscape:document-units="px" 58.164 + inkscape:current-layer="layer1" 58.165 + showguides="true" 58.166 + inkscape:guide-bbox="true" 58.167 + inkscape:window-width="906" 58.168 + inkscape:window-height="659" 58.169 + inkscape:window-x="75" 58.170 + inkscape:window-y="69" 58.171 + showgrid="false"> 58.172 + <sodipodi:guide 58.173 + orientation="vertical" 58.174 + position="-1.4285714" 58.175 + id="guide6022" /> 58.176 + </sodipodi:namedview> 58.177 + <metadata 58.178 + id="metadata5976"> 58.179 + <rdf:RDF> 58.180 + <cc:Work 58.181 + rdf:about=""> 58.182 + <dc:format>image/svg+xml</dc:format> 58.183 + <dc:type 58.184 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 58.185 + </cc:Work> 58.186 + </rdf:RDF> 58.187 + </metadata> 58.188 + <g 58.189 + inkscape:label="Layer 1" 58.190 + inkscape:groupmode="layer" 58.191 + id="layer1"> 58.192 + <rect 58.193 + y="246.06918" 58.194 + x="64.325172" 58.195 + height="204.26233" 58.196 + width="333.2135" 58.197 + id="rect6047" 58.198 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 58.199 + <g 58.200 + id="g1935"> 58.201 + <rect 58.202 + y="266.24374" 58.203 + x="84.113708" 58.204 + height="44.537449" 58.205 + width="134.53746" 58.206 + id="rect5996" 58.207 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 58.208 + <text 58.209 + id="text5998" 58.210 + y="292.00446" 58.211 + x="108.7962" 58.212 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.213 + xml:space="preserve"><tspan 58.214 + style="font-family:Courier" 58.215 + y="292.00446" 58.216 + x="108.7962" 58.217 + id="tspan6000" 58.218 + sodipodi:role="line">e7639888bb2f</tspan></text> 58.219 + </g> 58.220 + <g 58.221 + id="g6976" 58.222 + transform="translate(70,0)"> 58.223 + <rect 58.224 + y="327.9104" 58.225 + x="40.113693" 58.226 + height="44.537449" 58.227 + width="134.53746" 58.228 + id="rect6004" 58.229 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 58.230 + <text 58.231 + id="text6006" 58.232 + y="353.67111" 58.233 + x="62.654205" 58.234 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.235 + xml:space="preserve"><tspan 58.236 + style="font-family:Courier" 58.237 + y="353.67111" 58.238 + x="62.654205" 58.239 + id="tspan6008" 58.240 + sodipodi:role="line">7b064d8bac5e</tspan></text> 58.241 + </g> 58.242 + <path 58.243 + inkscape:connector-type="polyline" 58.244 + id="path6020" 58.245 + d="M 160.92915,311.15532 L 167.83571,327.53627" 58.246 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 58.247 + inkscape:connection-end="#g6976" 58.248 + inkscape:connection-start="#g1935" /> 58.249 + <rect 58.250 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 58.251 + id="rect6039" 58.252 + width="134.53746" 58.253 + height="44.537449" 58.254 + x="110.11359" 58.255 + y="389.57703" /> 58.256 + <text 58.257 + xml:space="preserve" 58.258 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.259 + x="134.79706" 58.260 + y="415.33771" 58.261 + id="text6041"><tspan 58.262 + sodipodi:role="line" 58.263 + id="tspan6043" 58.264 + x="134.79706" 58.265 + y="415.33771" 58.266 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 58.267 + <path 58.268 + inkscape:connection-end="#rect6039" 58.269 + inkscape:connector-type="polyline" 58.270 + id="path6045" 58.271 + d="M 177.38238,372.82195 L 177.38235,389.20303" 58.272 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 58.273 + <rect 58.274 + y="245.94225" 58.275 + x="447.28412" 58.276 + height="204.51619" 58.277 + width="174.36833" 58.278 + id="rect6140" 58.279 + style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 58.280 + <g 58.281 + id="g6130" 58.282 + transform="translate(152.3254,24.38544)"> 58.283 + <rect 58.284 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 58.285 + id="rect6106" 58.286 + width="134.53746" 58.287 + height="44.537449" 58.288 + x="314.87415" 58.289 + y="257.95059" /> 58.290 + <text 58.291 + xml:space="preserve" 58.292 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.293 + x="339.55664" 58.294 + y="283.7113" 58.295 + id="text6108"><tspan 58.296 + sodipodi:role="line" 58.297 + id="tspan6110" 58.298 + x="339.55664" 58.299 + y="283.7113" 58.300 + style="font-family:Courier">ffb20e1701ea</tspan></text> 58.301 + </g> 58.302 + <g 58.303 + id="g6135" 58.304 + transform="translate(153.0396,49.83106)"> 58.305 + <rect 58.306 + inkscape:transform-center-y="102.85714" 58.307 + inkscape:transform-center-x="129.28571" 58.308 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 58.309 + id="rect6112" 58.310 + width="134.53746" 58.311 + height="44.537449" 58.312 + x="314.15985" 58.313 + y="326.52203" /> 58.314 + <text 58.315 + inkscape:transform-center-y="102.7311" 58.316 + inkscape:transform-center-x="128.69672" 58.317 + xml:space="preserve" 58.318 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.319 + x="338.84335" 58.320 + y="352.28271" 58.321 + id="text6114"><tspan 58.322 + sodipodi:role="line" 58.323 + id="tspan6116" 58.324 + x="338.84335" 58.325 + y="352.28271" 58.326 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 58.327 + </g> 58.328 + <text 58.329 + xml:space="preserve" 58.330 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.331 + x="466.63208" 58.332 + y="270.479" 58.333 + id="text6118"><tspan 58.334 + sodipodi:role="line" 58.335 + id="tspan6120" 58.336 + x="466.63208" 58.337 + y="270.479">Primer padre</tspan></text> 58.338 + <text 58.339 + xml:space="preserve" 58.340 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.341 + x="466.07544" 58.342 + y="364.49615" 58.343 + id="text6122"><tspan 58.344 + sodipodi:role="line" 58.345 + id="tspan6124" 58.346 + x="466.07544" 58.347 + y="364.49615">Segundo padre</tspan></text> 58.348 + <text 58.349 + xml:space="preserve" 58.350 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.351 + x="446.61743" 58.352 + y="231.36218" 58.353 + id="text6195"><tspan 58.354 + sodipodi:role="line" 58.355 + id="tspan6197" 58.356 + x="446.61743" 58.357 + y="231.36218">Padres del directorio de trabajo</tspan></text> 58.358 + <path 58.359 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 58.360 + d="M 466.82542,300.21999 L 377.00207,294.39744" 58.361 + id="path6266" 58.362 + inkscape:connector-type="polyline" 58.363 + inkscape:connection-start="#g6130" 58.364 + inkscape:connection-end="#rect1925" /> 58.365 + <path 58.366 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 58.367 + d="M 665.12232,418.17579 L 665.12232,418.17579" 58.368 + id="path6270" 58.369 + inkscape:connector-type="polyline" /> 58.370 + <g 58.371 + id="g2845"> 58.372 + <rect 58.373 + y="266.24374" 58.374 + x="242.09048" 58.375 + height="44.537449" 58.376 + width="134.53746" 58.377 + id="rect1925" 58.378 + style="fill:#9f9f9f;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 58.379 + <text 58.380 + id="text1927" 58.381 + y="292.00446" 58.382 + x="266.77298" 58.383 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.384 + xml:space="preserve"><tspan 58.385 + style="font-family:Courier" 58.386 + y="292.00446" 58.387 + x="266.77298" 58.388 + id="tspan1929" 58.389 + sodipodi:role="line">ffb20e1701ea</tspan></text> 58.390 + </g> 58.391 + <path 58.392 + inkscape:connector-type="polyline" 58.393 + id="path1933" 58.394 + d="M 260.89978,311.15532 L 225.84185,327.53627" 58.395 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 58.396 + inkscape:connection-end="#g6976" /> 58.397 + <text 58.398 + xml:space="preserve" 58.399 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.400 + x="109.45568" 58.401 + y="231.4554" 58.402 + id="text2837"><tspan 58.403 + sodipodi:role="line" 58.404 + id="tspan2839" 58.405 + x="109.45568" 58.406 + y="231.4554">Cabeza Pre-existente</tspan></text> 58.407 + <text 58.408 + xml:space="preserve" 58.409 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 58.410 + x="237.54184" 58.411 + y="231.4554" 58.412 + id="text2841"><tspan 58.413 + sodipodi:role="line" 58.414 + id="tspan2843" 58.415 + x="237.54184" 58.416 + y="231.4554">Cabeza recién creada (y tip)</tspan></text> 58.417 + <path 58.418 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 58.419 + d="M 148.05048,235.87482 L 149.94915,265.86962" 58.420 + id="path2850" 58.421 + inkscape:connector-type="polyline" 58.422 + inkscape:connection-end="#g1935" /> 58.423 + <path 58.424 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 58.425 + d="M 303.83495,238.08453 L 306.87874,265.86962" 58.426 + id="path2852" 58.427 + inkscape:connector-type="polyline" 58.428 + inkscape:connection-end="#g2845" /> 58.429 + </g> 58.430 +</svg>
59.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 59.2 +++ b/es/wdir-merge.svg Sat Oct 18 07:48:21 2008 -0500 59.3 @@ -0,0 +1,434 @@ 59.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 59.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 59.6 +<svg 59.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 59.8 + xmlns:cc="http://creativecommons.org/ns#" 59.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 59.10 + xmlns:svg="http://www.w3.org/2000/svg" 59.11 + xmlns="http://www.w3.org/2000/svg" 59.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 59.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 59.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 59.15 + width="744.09448819" 59.16 + height="1052.3622047" 59.17 + id="svg5971" 59.18 + sodipodi:version="0.32" 59.19 + inkscape:version="0.46" 59.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 59.21 + sodipodi:docname="wdir-merge.svg" 59.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 59.23 + <defs 59.24 + id="defs5973"> 59.25 + <inkscape:perspective 59.26 + sodipodi:type="inkscape:persp3d" 59.27 + inkscape:vp_x="0 : 526.18109 : 1" 59.28 + inkscape:vp_y="0 : 1000 : 0" 59.29 + inkscape:vp_z="744.09448 : 526.18109 : 1" 59.30 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 59.31 + id="perspective3259" /> 59.32 + <marker 59.33 + inkscape:stockid="Arrow1Mstart" 59.34 + orient="auto" 59.35 + refY="0.0" 59.36 + refX="0.0" 59.37 + id="Arrow1Mstart" 59.38 + style="overflow:visible"> 59.39 + <path 59.40 + id="path4855" 59.41 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 59.42 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 59.43 + transform="scale(0.4) translate(10,0)" /> 59.44 + </marker> 59.45 + <linearGradient 59.46 + id="linearGradient6049"> 59.47 + <stop 59.48 + style="stop-color:#686868;stop-opacity:1;" 59.49 + offset="0" 59.50 + id="stop6051" /> 59.51 + <stop 59.52 + style="stop-color:#f0f0f0;stop-opacity:1;" 59.53 + offset="1" 59.54 + id="stop6053" /> 59.55 + </linearGradient> 59.56 + <marker 59.57 + inkscape:stockid="Arrow1Mend" 59.58 + orient="auto" 59.59 + refY="0.0" 59.60 + refX="0.0" 59.61 + id="Arrow1Mend" 59.62 + style="overflow:visible;"> 59.63 + <path 59.64 + id="path4852" 59.65 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 59.66 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 59.67 + transform="scale(0.4) rotate(180) translate(10,0)" /> 59.68 + </marker> 59.69 + <linearGradient 59.70 + inkscape:collect="always" 59.71 + xlink:href="#linearGradient6049" 59.72 + id="linearGradient6083" 59.73 + gradientUnits="userSpaceOnUse" 59.74 + gradientTransform="translate(-240.0462,-8.633237e-6)" 59.75 + x1="333.91171" 59.76 + y1="488.79077" 59.77 + x2="508.94543" 59.78 + y2="263.79077" /> 59.79 + <linearGradient 59.80 + inkscape:collect="always" 59.81 + xlink:href="#linearGradient6049" 59.82 + id="linearGradient6142" 59.83 + gradientUnits="userSpaceOnUse" 59.84 + gradientTransform="translate(-42.00893,-30.49544)" 59.85 + x1="333.91171" 59.86 + y1="488.79077" 59.87 + x2="508.94543" 59.88 + y2="263.79077" /> 59.89 + <linearGradient 59.90 + inkscape:collect="always" 59.91 + xlink:href="#linearGradient6049" 59.92 + id="linearGradient6193" 59.93 + gradientUnits="userSpaceOnUse" 59.94 + gradientTransform="translate(-240.0462,-8.633237e-6)" 59.95 + x1="333.91171" 59.96 + y1="488.79077" 59.97 + x2="508.94543" 59.98 + y2="263.79077" /> 59.99 + <linearGradient 59.100 + inkscape:collect="always" 59.101 + xlink:href="#linearGradient6049" 59.102 + id="linearGradient6216" 59.103 + gradientUnits="userSpaceOnUse" 59.104 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 59.105 + x1="333.91171" 59.106 + y1="488.79077" 59.107 + x2="508.94543" 59.108 + y2="263.79077" /> 59.109 + <linearGradient 59.110 + inkscape:collect="always" 59.111 + xlink:href="#linearGradient6049" 59.112 + id="linearGradient6232" 59.113 + gradientUnits="userSpaceOnUse" 59.114 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 59.115 + x1="333.91171" 59.116 + y1="488.79077" 59.117 + x2="508.94543" 59.118 + y2="263.79077" /> 59.119 + <linearGradient 59.120 + inkscape:collect="always" 59.121 + xlink:href="#linearGradient6049" 59.122 + id="linearGradient6445" 59.123 + gradientUnits="userSpaceOnUse" 59.124 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 59.125 + x1="333.91171" 59.126 + y1="488.79077" 59.127 + x2="508.94543" 59.128 + y2="263.79077" /> 59.129 + <linearGradient 59.130 + inkscape:collect="always" 59.131 + xlink:href="#linearGradient6049" 59.132 + id="linearGradient6974" 59.133 + gradientUnits="userSpaceOnUse" 59.134 + gradientTransform="matrix(1.911882,0,0,0.789965,-574.7896,51.22599)" 59.135 + x1="333.91171" 59.136 + y1="488.79077" 59.137 + x2="508.94543" 59.138 + y2="263.79077" /> 59.139 + <linearGradient 59.140 + inkscape:collect="always" 59.141 + xlink:href="#linearGradient6049" 59.142 + id="linearGradient6996" 59.143 + gradientUnits="userSpaceOnUse" 59.144 + gradientTransform="matrix(1.000473,0,0,0.790947,112.8399,50.85693)" 59.145 + x1="333.91171" 59.146 + y1="488.79077" 59.147 + x2="508.94543" 59.148 + y2="263.79077" /> 59.149 + </defs> 59.150 + <sodipodi:namedview 59.151 + id="base" 59.152 + pagecolor="#ffffff" 59.153 + bordercolor="#666666" 59.154 + borderopacity="1.0" 59.155 + gridtolerance="10000" 59.156 + guidetolerance="10" 59.157 + objecttolerance="10" 59.158 + inkscape:pageopacity="0.0" 59.159 + inkscape:pageshadow="2" 59.160 + inkscape:zoom="1.28" 59.161 + inkscape:cx="345.85973" 59.162 + inkscape:cy="690.49342" 59.163 + inkscape:document-units="px" 59.164 + inkscape:current-layer="layer1" 59.165 + showguides="true" 59.166 + inkscape:guide-bbox="true" 59.167 + inkscape:window-width="906" 59.168 + inkscape:window-height="659" 59.169 + inkscape:window-x="338" 59.170 + inkscape:window-y="50" 59.171 + showgrid="false"> 59.172 + <sodipodi:guide 59.173 + orientation="vertical" 59.174 + position="-1.4285714" 59.175 + id="guide6022" /> 59.176 + </sodipodi:namedview> 59.177 + <metadata 59.178 + id="metadata5976"> 59.179 + <rdf:RDF> 59.180 + <cc:Work 59.181 + rdf:about=""> 59.182 + <dc:format>image/svg+xml</dc:format> 59.183 + <dc:type 59.184 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 59.185 + </cc:Work> 59.186 + </rdf:RDF> 59.187 + </metadata> 59.188 + <g 59.189 + inkscape:label="Layer 1" 59.190 + inkscape:groupmode="layer" 59.191 + id="layer1"> 59.192 + <rect 59.193 + y="246.06918" 59.194 + x="64.325172" 59.195 + height="204.26233" 59.196 + width="333.2135" 59.197 + id="rect6047" 59.198 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.91925466;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 59.199 + <g 59.200 + id="g6976" 59.201 + transform="translate(70,0)"> 59.202 + <rect 59.203 + y="327.9104" 59.204 + x="40.113693" 59.205 + height="44.537449" 59.206 + width="134.53746" 59.207 + id="rect6004" 59.208 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 59.209 + <text 59.210 + id="text6006" 59.211 + y="353.67111" 59.212 + x="62.654205" 59.213 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.214 + xml:space="preserve"><tspan 59.215 + style="font-family:Courier" 59.216 + y="353.67111" 59.217 + x="62.654205" 59.218 + id="tspan6008" 59.219 + sodipodi:role="line">7b064d8bac5e</tspan></text> 59.220 + </g> 59.221 + <path 59.222 + inkscape:connector-type="polyline" 59.223 + id="path6020" 59.224 + d="M 160.92915,311.15532 L 167.83571,327.53627" 59.225 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 59.226 + inkscape:connection-end="#g6976" 59.227 + inkscape:connection-start="#g1935" /> 59.228 + <rect 59.229 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 59.230 + id="rect6039" 59.231 + width="134.53746" 59.232 + height="44.537449" 59.233 + x="110.11359" 59.234 + y="389.57703" /> 59.235 + <text 59.236 + xml:space="preserve" 59.237 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.238 + x="134.79706" 59.239 + y="415.33771" 59.240 + id="text6041"><tspan 59.241 + sodipodi:role="line" 59.242 + id="tspan6043" 59.243 + x="134.79706" 59.244 + y="415.33771" 59.245 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 59.246 + <path 59.247 + inkscape:connection-end="#rect6039" 59.248 + inkscape:connector-type="polyline" 59.249 + id="path6045" 59.250 + d="M 177.38238,372.82195 L 177.38235,389.20303" 59.251 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 59.252 + <rect 59.253 + y="245.94225" 59.254 + x="447.28412" 59.255 + height="204.51619" 59.256 + width="174.36833" 59.257 + id="rect6140" 59.258 + style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 59.259 + <g 59.260 + id="g6130" 59.261 + transform="translate(152.3254,24.38544)"> 59.262 + <rect 59.263 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 59.264 + id="rect6106" 59.265 + width="134.53746" 59.266 + height="44.537449" 59.267 + x="314.87415" 59.268 + y="257.95059" /> 59.269 + <text 59.270 + xml:space="preserve" 59.271 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.272 + x="339.55664" 59.273 + y="283.7113" 59.274 + id="text6108"><tspan 59.275 + sodipodi:role="line" 59.276 + id="tspan6110" 59.277 + x="339.55664" 59.278 + y="283.7113" 59.279 + style="font-family:Courier">ffb20e1701ea</tspan></text> 59.280 + </g> 59.281 + <g 59.282 + id="g6135" 59.283 + transform="translate(153.0396,49.83106)"> 59.284 + <rect 59.285 + inkscape:transform-center-y="102.85714" 59.286 + inkscape:transform-center-x="129.28571" 59.287 + style="fill:#d4d4d4;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 59.288 + id="rect6112" 59.289 + width="134.53746" 59.290 + height="44.537449" 59.291 + x="314.15985" 59.292 + y="326.52203" /> 59.293 + <text 59.294 + inkscape:transform-center-y="102.7311" 59.295 + inkscape:transform-center-x="128.69672" 59.296 + xml:space="preserve" 59.297 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.298 + x="338.84335" 59.299 + y="352.28271" 59.300 + id="text6114"><tspan 59.301 + sodipodi:role="line" 59.302 + id="tspan6116" 59.303 + x="338.84335" 59.304 + y="352.28271" 59.305 + style="fill:black;fill-opacity:1;font-family:Courier">e7639888bb2f</tspan></text> 59.306 + </g> 59.307 + <text 59.308 + xml:space="preserve" 59.309 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.310 + x="466.63208" 59.311 + y="270.479" 59.312 + id="text6118"><tspan 59.313 + sodipodi:role="line" 59.314 + id="tspan6120" 59.315 + x="466.63208" 59.316 + y="270.479">Primer padre (sin cambio)</tspan></text> 59.317 + <text 59.318 + xml:space="preserve" 59.319 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.320 + x="466.07544" 59.321 + y="364.49615" 59.322 + id="text6122"><tspan 59.323 + sodipodi:role="line" 59.324 + id="tspan6124" 59.325 + x="466.07544" 59.326 + y="364.49615">Segundo padre</tspan></text> 59.327 + <text 59.328 + xml:space="preserve" 59.329 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.330 + x="446.61743" 59.331 + y="231.36218" 59.332 + id="text6195"><tspan 59.333 + sodipodi:role="line" 59.334 + id="tspan6197" 59.335 + x="446.61743" 59.336 + y="231.36218">Padres del directorio de trabajo</tspan></text> 59.337 + <path 59.338 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 59.339 + d="M 466.82542,300.21999 L 377.00207,294.39744" 59.340 + id="path6266" 59.341 + inkscape:connector-type="polyline" 59.342 + inkscape:connection-start="#g6130" 59.343 + inkscape:connection-end="#rect1925" /> 59.344 + <path 59.345 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 59.346 + d="M 665.12232,418.17579 L 665.12232,418.17579" 59.347 + id="path6270" 59.348 + inkscape:connector-type="polyline" /> 59.349 + <g 59.350 + id="g2845"> 59.351 + <rect 59.352 + y="266.24374" 59.353 + x="242.09048" 59.354 + height="44.537449" 59.355 + width="134.53746" 59.356 + id="rect1925" 59.357 + style="fill:#9f9f9f;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 59.358 + <text 59.359 + id="text1927" 59.360 + y="292.00446" 59.361 + x="266.77298" 59.362 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.363 + xml:space="preserve"><tspan 59.364 + style="font-family:Courier" 59.365 + y="292.00446" 59.366 + x="266.77298" 59.367 + id="tspan1929" 59.368 + sodipodi:role="line">ffb20e1701ea</tspan></text> 59.369 + </g> 59.370 + <path 59.371 + inkscape:connector-type="polyline" 59.372 + id="path1933" 59.373 + d="M 260.89978,311.15532 L 225.84185,327.53627" 59.374 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1;display:inline" 59.375 + inkscape:connection-end="#g6976" /> 59.376 + <text 59.377 + xml:space="preserve" 59.378 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.379 + x="109.45568" 59.380 + y="231.4554" 59.381 + id="text2837"><tspan 59.382 + sodipodi:role="line" 59.383 + id="tspan2839" 59.384 + x="109.45568" 59.385 + y="231.4554">Cabeza pre-existente</tspan></text> 59.386 + <text 59.387 + xml:space="preserve" 59.388 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.389 + x="237.54184" 59.390 + y="231.4554" 59.391 + id="text2841"><tspan 59.392 + sodipodi:role="line" 59.393 + id="tspan2843" 59.394 + x="237.54184" 59.395 + y="231.4554">Cabeza recién creada(y tip)</tspan></text> 59.396 + <path 59.397 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 59.398 + d="M 148.05048,235.87482 L 149.94915,265.86962" 59.399 + id="path2850" 59.400 + inkscape:connector-type="polyline" 59.401 + inkscape:connection-end="#g1935" /> 59.402 + <path 59.403 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Mend)" 59.404 + d="M 303.83495,238.08453 L 306.87874,265.86962" 59.405 + id="path2852" 59.406 + inkscape:connector-type="polyline" 59.407 + inkscape:connection-end="#g2845" /> 59.408 + <path 59.409 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 59.410 + d="M 466.82545,379.17944 L 219.0253,307.95488" 59.411 + id="path3016" 59.412 + inkscape:connector-type="polyline" 59.413 + inkscape:connection-start="#g6135" 59.414 + inkscape:connection-end="#g1935" /> 59.415 + <g 59.416 + id="g1935"> 59.417 + <rect 59.418 + y="266.24374" 59.419 + x="84.113708" 59.420 + height="44.537449" 59.421 + width="134.53746" 59.422 + id="rect5996" 59.423 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 59.424 + <text 59.425 + id="text5998" 59.426 + y="292.00446" 59.427 + x="108.7962" 59.428 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 59.429 + xml:space="preserve"><tspan 59.430 + style="font-family:Courier" 59.431 + y="292.00446" 59.432 + x="108.7962" 59.433 + id="tspan6000" 59.434 + sodipodi:role="line">e7639888bb2f</tspan></text> 59.435 + </g> 59.436 + </g> 59.437 +</svg>
60.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 60.2 +++ b/es/wdir-pre-branch.svg Sat Oct 18 07:48:21 2008 -0500 60.3 @@ -0,0 +1,373 @@ 60.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 60.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 60.6 +<svg 60.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 60.8 + xmlns:cc="http://creativecommons.org/ns#" 60.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 60.10 + xmlns:svg="http://www.w3.org/2000/svg" 60.11 + xmlns="http://www.w3.org/2000/svg" 60.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 60.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 60.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 60.15 + width="744.09448819" 60.16 + height="1052.3622047" 60.17 + id="svg5971" 60.18 + sodipodi:version="0.32" 60.19 + inkscape:version="0.46" 60.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 60.21 + sodipodi:docname="wdir-pre-branch.svg" 60.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 60.23 + <defs 60.24 + id="defs5973"> 60.25 + <inkscape:perspective 60.26 + sodipodi:type="inkscape:persp3d" 60.27 + inkscape:vp_x="0 : 526.18109 : 1" 60.28 + inkscape:vp_y="0 : 1000 : 0" 60.29 + inkscape:vp_z="744.09448 : 526.18109 : 1" 60.30 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 60.31 + id="perspective3314" /> 60.32 + <marker 60.33 + inkscape:stockid="Arrow1Mstart" 60.34 + orient="auto" 60.35 + refY="0.0" 60.36 + refX="0.0" 60.37 + id="Arrow1Mstart" 60.38 + style="overflow:visible"> 60.39 + <path 60.40 + id="path4855" 60.41 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 60.42 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 60.43 + transform="scale(0.4) translate(10,0)" /> 60.44 + </marker> 60.45 + <linearGradient 60.46 + id="linearGradient6049"> 60.47 + <stop 60.48 + style="stop-color:#686868;stop-opacity:1;" 60.49 + offset="0" 60.50 + id="stop6051" /> 60.51 + <stop 60.52 + style="stop-color:#f0f0f0;stop-opacity:1;" 60.53 + offset="1" 60.54 + id="stop6053" /> 60.55 + </linearGradient> 60.56 + <marker 60.57 + inkscape:stockid="Arrow1Mend" 60.58 + orient="auto" 60.59 + refY="0.0" 60.60 + refX="0.0" 60.61 + id="Arrow1Mend" 60.62 + style="overflow:visible;"> 60.63 + <path 60.64 + id="path4852" 60.65 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 60.66 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 60.67 + transform="scale(0.4) rotate(180) translate(10,0)" /> 60.68 + </marker> 60.69 + <linearGradient 60.70 + inkscape:collect="always" 60.71 + xlink:href="#linearGradient6049" 60.72 + id="linearGradient6083" 60.73 + gradientUnits="userSpaceOnUse" 60.74 + gradientTransform="translate(-240.0462,-8.633237e-6)" 60.75 + x1="333.91171" 60.76 + y1="488.79077" 60.77 + x2="508.94543" 60.78 + y2="263.79077" /> 60.79 + <linearGradient 60.80 + inkscape:collect="always" 60.81 + xlink:href="#linearGradient6049" 60.82 + id="linearGradient6142" 60.83 + gradientUnits="userSpaceOnUse" 60.84 + gradientTransform="translate(-42.00893,-30.49544)" 60.85 + x1="333.91171" 60.86 + y1="488.79077" 60.87 + x2="508.94543" 60.88 + y2="263.79077" /> 60.89 + <linearGradient 60.90 + inkscape:collect="always" 60.91 + xlink:href="#linearGradient6049" 60.92 + id="linearGradient6193" 60.93 + gradientUnits="userSpaceOnUse" 60.94 + gradientTransform="translate(-240.0462,-8.633237e-6)" 60.95 + x1="333.91171" 60.96 + y1="488.79077" 60.97 + x2="508.94543" 60.98 + y2="263.79077" /> 60.99 + <linearGradient 60.100 + inkscape:collect="always" 60.101 + xlink:href="#linearGradient6049" 60.102 + id="linearGradient6216" 60.103 + gradientUnits="userSpaceOnUse" 60.104 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 60.105 + x1="333.91171" 60.106 + y1="488.79077" 60.107 + x2="508.94543" 60.108 + y2="263.79077" /> 60.109 + <linearGradient 60.110 + inkscape:collect="always" 60.111 + xlink:href="#linearGradient6049" 60.112 + id="linearGradient6232" 60.113 + gradientUnits="userSpaceOnUse" 60.114 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 60.115 + x1="333.91171" 60.116 + y1="488.79077" 60.117 + x2="508.94543" 60.118 + y2="263.79077" /> 60.119 + <linearGradient 60.120 + inkscape:collect="always" 60.121 + xlink:href="#linearGradient6049" 60.122 + id="linearGradient6445" 60.123 + gradientUnits="userSpaceOnUse" 60.124 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 60.125 + x1="333.91171" 60.126 + y1="488.79077" 60.127 + x2="508.94543" 60.128 + y2="263.79077" /> 60.129 + <linearGradient 60.130 + inkscape:collect="always" 60.131 + xlink:href="#linearGradient6049" 60.132 + id="linearGradient6974" 60.133 + gradientUnits="userSpaceOnUse" 60.134 + gradientTransform="matrix(1.000474,0,0,0.790947,-314.246,50.85694)" 60.135 + x1="333.91171" 60.136 + y1="488.79077" 60.137 + x2="508.94543" 60.138 + y2="263.79077" /> 60.139 + <linearGradient 60.140 + inkscape:collect="always" 60.141 + xlink:href="#linearGradient6049" 60.142 + id="linearGradient6996" 60.143 + gradientUnits="userSpaceOnUse" 60.144 + gradientTransform="matrix(1.000473,0,0,0.790947,-85.16012,50.85693)" 60.145 + x1="333.91171" 60.146 + y1="488.79077" 60.147 + x2="508.94543" 60.148 + y2="263.79077" /> 60.149 + </defs> 60.150 + <sodipodi:namedview 60.151 + id="base" 60.152 + pagecolor="#ffffff" 60.153 + bordercolor="#666666" 60.154 + borderopacity="1.0" 60.155 + gridtolerance="10000" 60.156 + guidetolerance="10" 60.157 + objecttolerance="10" 60.158 + inkscape:pageopacity="0.0" 60.159 + inkscape:pageshadow="2" 60.160 + inkscape:zoom="0.64" 60.161 + inkscape:cx="235.37429" 60.162 + inkscape:cy="726.21069" 60.163 + inkscape:document-units="px" 60.164 + inkscape:current-layer="layer1" 60.165 + showguides="true" 60.166 + inkscape:guide-bbox="true" 60.167 + inkscape:window-width="906" 60.168 + inkscape:window-height="659" 60.169 + inkscape:window-x="2" 60.170 + inkscape:window-y="43" 60.171 + showgrid="false"> 60.172 + <sodipodi:guide 60.173 + orientation="vertical" 60.174 + position="-1.4285714" 60.175 + id="guide6022" /> 60.176 + </sodipodi:namedview> 60.177 + <metadata 60.178 + id="metadata5976"> 60.179 + <rdf:RDF> 60.180 + <cc:Work 60.181 + rdf:about=""> 60.182 + <dc:format>image/svg+xml</dc:format> 60.183 + <dc:type 60.184 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 60.185 + </cc:Work> 60.186 + </rdf:RDF> 60.187 + </metadata> 60.188 + <g 60.189 + inkscape:label="Layer 1" 60.190 + inkscape:groupmode="layer" 60.191 + id="layer1"> 60.192 + <rect 60.193 + y="245.94225" 60.194 + x="20.198257" 60.195 + height="204.51619" 60.196 + width="174.36833" 60.197 + id="rect6047" 60.198 + style="fill:url(#linearGradient6974);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 60.199 + <rect 60.200 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 60.201 + id="rect5996" 60.202 + width="134.53746" 60.203 + height="44.537449" 60.204 + x="40.113693" 60.205 + y="266.24374" /> 60.206 + <text 60.207 + xml:space="preserve" 60.208 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.209 + x="64.796204" 60.210 + y="292.00446" 60.211 + id="text5998"><tspan 60.212 + sodipodi:role="line" 60.213 + id="tspan6000" 60.214 + x="64.796204" 60.215 + y="292.00446" 60.216 + style="font-family:Courier">e7639888bb2f</tspan></text> 60.217 + <g 60.218 + id="g6976"> 60.219 + <rect 60.220 + y="327.9104" 60.221 + x="40.113693" 60.222 + height="44.537449" 60.223 + width="134.53746" 60.224 + id="rect6004" 60.225 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 60.226 + <text 60.227 + id="text6006" 60.228 + y="353.67111" 60.229 + x="62.654205" 60.230 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.231 + xml:space="preserve"><tspan 60.232 + style="font-family:Courier" 60.233 + y="353.67111" 60.234 + x="62.654205" 60.235 + id="tspan6008" 60.236 + sodipodi:role="line">7b064d8bac5e</tspan></text> 60.237 + </g> 60.238 + <path 60.239 + inkscape:connection-end="#rect6004" 60.240 + inkscape:connector-type="polyline" 60.241 + id="path6020" 60.242 + d="M 107.38242,311.15529 L 107.38242,327.53626" 60.243 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 60.244 + <rect 60.245 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 60.246 + id="rect6039" 60.247 + width="134.53746" 60.248 + height="44.537449" 60.249 + x="40.113571" 60.250 + y="389.57703" /> 60.251 + <text 60.252 + xml:space="preserve" 60.253 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.254 + x="64.797073" 60.255 + y="415.33771" 60.256 + id="text6041"><tspan 60.257 + sodipodi:role="line" 60.258 + id="tspan6043" 60.259 + x="64.797073" 60.260 + y="415.33771" 60.261 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 60.262 + <path 60.263 + inkscape:connection-end="#rect6039" 60.264 + inkscape:connector-type="polyline" 60.265 + id="path6045" 60.266 + d="M 107.38238,372.82195 L 107.38235,389.20301" 60.267 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" /> 60.268 + <text 60.269 + xml:space="preserve" 60.270 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.271 + x="19.660461" 60.272 + y="231.36218" 60.273 + id="text6102"><tspan 60.274 + sodipodi:role="line" 60.275 + id="tspan6104" 60.276 + x="19.660461" 60.277 + y="231.36218">Historia en el repositorio</tspan></text> 60.278 + <rect 60.279 + y="245.94225" 60.280 + x="249.28412" 60.281 + height="204.51619" 60.282 + width="174.36833" 60.283 + id="rect6140" 60.284 + style="fill:url(#linearGradient6996);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 60.285 + <g 60.286 + id="g6130" 60.287 + transform="translate(-45.67459,24.38544)"> 60.288 + <rect 60.289 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" 60.290 + id="rect6106" 60.291 + width="134.53746" 60.292 + height="44.537449" 60.293 + x="314.87415" 60.294 + y="257.95059" /> 60.295 + <text 60.296 + xml:space="preserve" 60.297 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.298 + x="339.55664" 60.299 + y="283.7113" 60.300 + id="text6108"><tspan 60.301 + sodipodi:role="line" 60.302 + id="tspan6110" 60.303 + x="339.55664" 60.304 + y="283.7113" 60.305 + style="font-family:Courier">7b064d8bac5e</tspan></text> 60.306 + </g> 60.307 + <g 60.308 + id="g6135" 60.309 + transform="translate(-44.96042,49.83106)"> 60.310 + <rect 60.311 + inkscape:transform-center-y="102.85714" 60.312 + inkscape:transform-center-x="129.28571" 60.313 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 60.314 + id="rect6112" 60.315 + width="134.53746" 60.316 + height="44.537449" 60.317 + x="314.15985" 60.318 + y="326.52203" /> 60.319 + <text 60.320 + inkscape:transform-center-y="102.7311" 60.321 + inkscape:transform-center-x="128.69672" 60.322 + xml:space="preserve" 60.323 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.324 + x="338.84335" 60.325 + y="352.28271" 60.326 + id="text6114"><tspan 60.327 + sodipodi:role="line" 60.328 + id="tspan6116" 60.329 + x="338.84335" 60.330 + y="352.28271" 60.331 + style="fill:#979797;fill-opacity:1;font-family:Courier">000000000000</tspan></text> 60.332 + </g> 60.333 + <text 60.334 + xml:space="preserve" 60.335 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.336 + x="268.63208" 60.337 + y="270.479" 60.338 + id="text6118"><tspan 60.339 + sodipodi:role="line" 60.340 + id="tspan6120" 60.341 + x="268.63208" 60.342 + y="270.479">Primer padre</tspan></text> 60.343 + <text 60.344 + xml:space="preserve" 60.345 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.346 + x="268.07544" 60.347 + y="364.49615" 60.348 + id="text6122"><tspan 60.349 + sodipodi:role="line" 60.350 + id="tspan6124" 60.351 + x="268.07544" 60.352 + y="364.49615">Segundo padre</tspan></text> 60.353 + <text 60.354 + xml:space="preserve" 60.355 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 60.356 + x="248.61746" 60.357 + y="231.36218" 60.358 + id="text6195"><tspan 60.359 + sodipodi:role="line" 60.360 + id="tspan6197" 60.361 + x="248.61746" 60.362 + y="231.36218">Padres del directorio de trabajo</tspan></text> 60.363 + <path 60.364 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 60.365 + d="M 268.82543,318.06163 L 175.02528,336.72225" 60.366 + id="path6266" 60.367 + inkscape:connector-type="polyline" 60.368 + inkscape:connection-end="#g6976" 60.369 + inkscape:connection-start="#g6130" /> 60.370 + <path 60.371 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 60.372 + d="M 665.12232,418.17579 L 665.12232,418.17579" 60.373 + id="path6270" 60.374 + inkscape:connector-type="polyline" /> 60.375 + </g> 60.376 +</svg>
61.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 61.2 +++ b/es/wdir.svg Sat Oct 18 07:48:21 2008 -0500 61.3 @@ -0,0 +1,357 @@ 61.4 +<?xml version="1.0" encoding="UTF-8" standalone="no"?> 61.5 +<!-- Created with Inkscape (http://www.inkscape.org/) --> 61.6 +<svg 61.7 + xmlns:dc="http://purl.org/dc/elements/1.1/" 61.8 + xmlns:cc="http://creativecommons.org/ns#" 61.9 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 61.10 + xmlns:svg="http://www.w3.org/2000/svg" 61.11 + xmlns="http://www.w3.org/2000/svg" 61.12 + xmlns:xlink="http://www.w3.org/1999/xlink" 61.13 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" 61.14 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" 61.15 + width="744.09448819" 61.16 + height="1052.3622047" 61.17 + id="svg5971" 61.18 + sodipodi:version="0.32" 61.19 + inkscape:version="0.46" 61.20 + sodipodi:docbase="/home/bos/hg/hgbook/en" 61.21 + sodipodi:docname="wdir.svg" 61.22 + inkscape:output_extension="org.inkscape.output.svg.inkscape"> 61.23 + <defs 61.24 + id="defs5973"> 61.25 + <inkscape:perspective 61.26 + sodipodi:type="inkscape:persp3d" 61.27 + inkscape:vp_x="0 : 526.18109 : 1" 61.28 + inkscape:vp_y="0 : 1000 : 0" 61.29 + inkscape:vp_z="744.09448 : 526.18109 : 1" 61.30 + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" 61.31 + id="perspective3368" /> 61.32 + <marker 61.33 + inkscape:stockid="Arrow1Mstart" 61.34 + orient="auto" 61.35 + refY="0.0" 61.36 + refX="0.0" 61.37 + id="Arrow1Mstart" 61.38 + style="overflow:visible"> 61.39 + <path 61.40 + id="path4855" 61.41 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 61.42 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none" 61.43 + transform="scale(0.4) translate(10,0)" /> 61.44 + </marker> 61.45 + <linearGradient 61.46 + id="linearGradient6049"> 61.47 + <stop 61.48 + style="stop-color:#686868;stop-opacity:1;" 61.49 + offset="0" 61.50 + id="stop6051" /> 61.51 + <stop 61.52 + style="stop-color:#f0f0f0;stop-opacity:1;" 61.53 + offset="1" 61.54 + id="stop6053" /> 61.55 + </linearGradient> 61.56 + <marker 61.57 + inkscape:stockid="Arrow1Mend" 61.58 + orient="auto" 61.59 + refY="0.0" 61.60 + refX="0.0" 61.61 + id="Arrow1Mend" 61.62 + style="overflow:visible;"> 61.63 + <path 61.64 + id="path4852" 61.65 + d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " 61.66 + style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;" 61.67 + transform="scale(0.4) rotate(180) translate(10,0)" /> 61.68 + </marker> 61.69 + <linearGradient 61.70 + inkscape:collect="always" 61.71 + xlink:href="#linearGradient6049" 61.72 + id="linearGradient6083" 61.73 + gradientUnits="userSpaceOnUse" 61.74 + gradientTransform="translate(-240.0462,-8.633237e-6)" 61.75 + x1="333.91171" 61.76 + y1="488.79077" 61.77 + x2="508.94543" 61.78 + y2="263.79077" /> 61.79 + <linearGradient 61.80 + inkscape:collect="always" 61.81 + xlink:href="#linearGradient6049" 61.82 + id="linearGradient6142" 61.83 + gradientUnits="userSpaceOnUse" 61.84 + gradientTransform="translate(-42.00893,-30.49544)" 61.85 + x1="333.91171" 61.86 + y1="488.79077" 61.87 + x2="508.94543" 61.88 + y2="263.79077" /> 61.89 + <linearGradient 61.90 + inkscape:collect="always" 61.91 + xlink:href="#linearGradient6049" 61.92 + id="linearGradient6193" 61.93 + gradientUnits="userSpaceOnUse" 61.94 + gradientTransform="translate(-240.0462,-8.633237e-6)" 61.95 + x1="333.91171" 61.96 + y1="488.79077" 61.97 + x2="508.94543" 61.98 + y2="263.79077" /> 61.99 + <linearGradient 61.100 + inkscape:collect="always" 61.101 + xlink:href="#linearGradient6049" 61.102 + id="linearGradient6216" 61.103 + gradientUnits="userSpaceOnUse" 61.104 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 61.105 + x1="333.91171" 61.106 + y1="488.79077" 61.107 + x2="508.94543" 61.108 + y2="263.79077" /> 61.109 + <linearGradient 61.110 + inkscape:collect="always" 61.111 + xlink:href="#linearGradient6049" 61.112 + id="linearGradient6232" 61.113 + gradientUnits="userSpaceOnUse" 61.114 + gradientTransform="matrix(1.000473,0,0,0.790947,-11.16012,50.85693)" 61.115 + x1="333.91171" 61.116 + y1="488.79077" 61.117 + x2="508.94543" 61.118 + y2="263.79077" /> 61.119 + <linearGradient 61.120 + inkscape:collect="always" 61.121 + xlink:href="#linearGradient6049" 61.122 + id="linearGradient6445" 61.123 + gradientUnits="userSpaceOnUse" 61.124 + gradientTransform="matrix(1.000474,0,0,0.790947,-240.246,50.9948)" 61.125 + x1="333.91171" 61.126 + y1="488.79077" 61.127 + x2="508.94543" 61.128 + y2="263.79077" /> 61.129 + </defs> 61.130 + <sodipodi:namedview 61.131 + id="base" 61.132 + pagecolor="#ffffff" 61.133 + bordercolor="#666666" 61.134 + borderopacity="1.0" 61.135 + gridtolerance="10000" 61.136 + guidetolerance="10" 61.137 + objecttolerance="10" 61.138 + inkscape:pageopacity="0.0" 61.139 + inkscape:pageshadow="2" 61.140 + inkscape:zoom="1.8101934" 61.141 + inkscape:cx="301.66555" 61.142 + inkscape:cy="721.33993" 61.143 + inkscape:document-units="px" 61.144 + inkscape:current-layer="layer1" 61.145 + showguides="true" 61.146 + inkscape:guide-bbox="true" 61.147 + inkscape:window-width="906" 61.148 + inkscape:window-height="659" 61.149 + inkscape:window-x="355" 61.150 + inkscape:window-y="55" 61.151 + showgrid="false"> 61.152 + <sodipodi:guide 61.153 + orientation="vertical" 61.154 + position="-1.4285714" 61.155 + id="guide6022" /> 61.156 + </sodipodi:namedview> 61.157 + <metadata 61.158 + id="metadata5976"> 61.159 + <rdf:RDF> 61.160 + <cc:Work 61.161 + rdf:about=""> 61.162 + <dc:format>image/svg+xml</dc:format> 61.163 + <dc:type 61.164 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> 61.165 + </cc:Work> 61.166 + </rdf:RDF> 61.167 + </metadata> 61.168 + <g 61.169 + inkscape:label="Layer 1" 61.170 + inkscape:groupmode="layer" 61.171 + id="layer1"> 61.172 + <g 61.173 + id="g6431" 61.174 + transform="translate(0,-0.137863)"> 61.175 + <rect 61.176 + style="fill:url(#linearGradient6445);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 61.177 + id="rect6047" 61.178 + width="174.36833" 61.179 + height="204.51619" 61.180 + x="94.198257" 61.181 + y="246.08011" /> 61.182 + <rect 61.183 + y="266.38159" 61.184 + x="114.11369" 61.185 + height="44.537449" 61.186 + width="134.53746" 61.187 + id="rect5996" 61.188 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 61.189 + <text 61.190 + id="text5998" 61.191 + y="292.1423" 61.192 + x="138.7962" 61.193 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.194 + xml:space="preserve"><tspan 61.195 + style="font-family:Courier" 61.196 + y="292.1423" 61.197 + x="138.7962" 61.198 + id="tspan6000" 61.199 + sodipodi:role="line">e7639888bb2f</tspan></text> 61.200 + <rect 61.201 + y="328.04825" 61.202 + x="114.11369" 61.203 + height="44.537449" 61.204 + width="134.53746" 61.205 + id="rect6004" 61.206 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 61.207 + <text 61.208 + id="text6006" 61.209 + y="353.80896" 61.210 + x="136.65421" 61.211 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.212 + xml:space="preserve"><tspan 61.213 + style="font-family:Courier" 61.214 + y="353.80896" 61.215 + x="136.65421" 61.216 + id="tspan6008" 61.217 + sodipodi:role="line">7b064d8bac5e</tspan></text> 61.218 + <path 61.219 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 61.220 + d="M 181.38242,311.29315 L 181.38242,327.67412" 61.221 + id="path6020" 61.222 + inkscape:connector-type="polyline" 61.223 + inkscape:connection-end="#rect6004" /> 61.224 + <rect 61.225 + y="389.71487" 61.226 + x="114.11357" 61.227 + height="44.537449" 61.228 + width="134.53746" 61.229 + id="rect6039" 61.230 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> 61.231 + <text 61.232 + id="text6041" 61.233 + y="415.47556" 61.234 + x="138.79707" 61.235 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.236 + xml:space="preserve"><tspan 61.237 + style="fill:#979797;fill-opacity:1;font-family:Courier" 61.238 + y="415.47556" 61.239 + x="138.79707" 61.240 + id="tspan6043" 61.241 + sodipodi:role="line">000000000000</tspan></text> 61.242 + <path 61.243 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#686868;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-opacity:1" 61.244 + d="M 181.38238,372.95981 L 181.38235,389.34087" 61.245 + id="path6045" 61.246 + inkscape:connector-type="polyline" 61.247 + inkscape:connection-end="#rect6039" /> 61.248 + </g> 61.249 + <text 61.250 + xml:space="preserve" 61.251 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.252 + x="93.660484" 61.253 + y="231.36218" 61.254 + id="text6102"><tspan 61.255 + sodipodi:role="line" 61.256 + id="tspan6104" 61.257 + x="93.660484" 61.258 + y="231.36218">Historia en el repositorio</tspan></text> 61.259 + <g 61.260 + id="g6416"> 61.261 + <rect 61.262 + style="fill:url(#linearGradient6232);fill-opacity:1;stroke:#686868;stroke-width:0.66539276;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 61.263 + id="rect6140" 61.264 + width="174.36833" 61.265 + height="204.51619" 61.266 + x="323.28412" 61.267 + y="245.94225" /> 61.268 + <g 61.269 + transform="translate(28.32541,24.38544)" 61.270 + id="g6130"> 61.271 + <rect 61.272 + y="257.95059" 61.273 + x="314.87415" 61.274 + height="44.537449" 61.275 + width="134.53746" 61.276 + id="rect6106" 61.277 + style="fill:#d4d4d4;fill-opacity:1;stroke:black;stroke-width:0.7482574;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:1.49651474, 0.74825737;stroke-dashoffset:0;stroke-opacity:1" /> 61.278 + <text 61.279 + id="text6108" 61.280 + y="283.7113" 61.281 + x="339.55664" 61.282 + style="font-size:12px;font-style:normal;font-weight:normal;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.283 + xml:space="preserve"><tspan 61.284 + style="font-family:Courier" 61.285 + y="283.7113" 61.286 + x="339.55664" 61.287 + id="tspan6110" 61.288 + sodipodi:role="line">e7639888bb2f</tspan></text> 61.289 + </g> 61.290 + <g 61.291 + transform="translate(29.03958,49.83106)" 61.292 + id="g6135"> 61.293 + <rect 61.294 + y="326.52203" 61.295 + x="314.15985" 61.296 + height="44.537449" 61.297 + width="134.53746" 61.298 + id="rect6112" 61.299 + style="fill:#ededed;fill-opacity:1;stroke:#797979;stroke-width:0.74800003;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" 61.300 + inkscape:transform-center-x="129.28571" 61.301 + inkscape:transform-center-y="102.85714" /> 61.302 + <text 61.303 + id="text6114" 61.304 + y="352.28271" 61.305 + x="338.84335" 61.306 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#979797;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.307 + xml:space="preserve" 61.308 + inkscape:transform-center-x="128.69672" 61.309 + inkscape:transform-center-y="102.7311"><tspan 61.310 + style="fill:#979797;fill-opacity:1;font-family:Courier" 61.311 + y="352.28271" 61.312 + x="338.84335" 61.313 + id="tspan6116" 61.314 + sodipodi:role="line">000000000000</tspan></text> 61.315 + </g> 61.316 + <text 61.317 + id="text6118" 61.318 + y="270.479" 61.319 + x="342.63208" 61.320 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.321 + xml:space="preserve"><tspan 61.322 + y="270.479" 61.323 + x="342.63208" 61.324 + id="tspan6120" 61.325 + sodipodi:role="line">Primer padre</tspan></text> 61.326 + <text 61.327 + id="text6122" 61.328 + y="364.49615" 61.329 + x="342.07544" 61.330 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.331 + xml:space="preserve"><tspan 61.332 + y="364.49615" 61.333 + x="342.07544" 61.334 + id="tspan6124" 61.335 + sodipodi:role="line">Segundo padre</tspan></text> 61.336 + </g> 61.337 + <text 61.338 + xml:space="preserve" 61.339 + style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Times New Roman" 61.340 + x="322.61746" 61.341 + y="231.36218" 61.342 + id="text6195"><tspan 61.343 + sodipodi:role="line" 61.344 + id="tspan6197" 61.345 + x="322.61746" 61.346 + y="231.36218">Padres del directorio de trabajo</tspan></text> 61.347 + <path 61.348 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker-end:url(#Arrow1Mend);stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" 61.349 + d="M 342.82543,299.89384 L 249.02528,293.36123" 61.350 + id="path6266" 61.351 + inkscape:connector-type="polyline" 61.352 + inkscape:connection-start="#g6130" 61.353 + inkscape:connection-end="#rect5996" /> 61.354 + <path 61.355 + style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" 61.356 + d="M 665.12232,418.17579 L 665.12232,418.17579" 61.357 + id="path6270" 61.358 + inkscape:connector-type="polyline" /> 61.359 + </g> 61.360 +</svg>