Mercurial > hgsubversion

annotate tests/fixtures/most-recent-is-edit-tag.sh @ 920:1be4ea4f3c0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
stupid: diff with the good revision when restoring branch Converting history like: r1 create trunk r2 remove trunk r3 make some unrelated commit r4 restore trunk from r2 stupid mode would retrieve and apply the diff with r3 instead of the one with r2. All the code deciding r2 is the actual parent was already there, only the revision argument was not passed. This fixes: - test_delete_restore_trunk in comprehensive/test_stupid_pull.py - test_delete_restore_trunk_stupid in comprehensive/test_verify_and_startrev.py Tested on OSX 10.6 with macports svn-1.7.5. I can no longer test with svn-1.6.
author Patrick Mezard <patrick@mezard.eu>
date Sun, 29 Jul 2012 13:13:56 +0200
parents 63cb630d667d
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
381
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 #!/bin/sh
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2 mkdir temp
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 cd temp
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 svnadmin create repo
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 svn co file://`pwd`/repo wc
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 cd wc
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 mkdir branches trunk tags
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 mkdir tags/versions
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 mkdir tags/blah
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 svn add *
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 svn ci -m 'btt'
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 cd trunk
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13 for a in alpha beta gamma delta ; do
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14 echo $a > $a
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 svn add $a
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 done
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 svn ci -m 'Add files.'
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18 cd ..
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 svn up
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20 svn cp trunk branches/dev_branch
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21 svn ci -m 'branch'
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22 cd branches/dev_branch
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 svn rm delta
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 echo narf > alpha
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25 echo iota > iota
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 svn add iota
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 svn ci -m 'branch changes'
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 cd ../..
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 svn up
474
63cb630d667d tags: handle the most recent commit being an edit to an svn tag properly
Augie Fackler <durin42@gmail.com>
parents: 381
diff changeset
30 svn cp branches/dev_branch tags/some-tag
63cb630d667d tags: handle the most recent commit being an edit to an svn tag properly
Augie Fackler <durin42@gmail.com>
parents: 381
diff changeset
31 svn ci -m 'Make a tag.'
381
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
32 svn up
474
63cb630d667d tags: handle the most recent commit being an edit to an svn tag properly
Augie Fackler <durin42@gmail.com>
parents: 381
diff changeset
33 echo foo > tags/some-tag/alpha
63cb630d667d tags: handle the most recent commit being an edit to an svn tag properly
Augie Fackler <durin42@gmail.com>
parents: 381
diff changeset
34 svn ci -m 'edit that tag'
381
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
35 cd ../..
474
63cb630d667d tags: handle the most recent commit being an edit to an svn tag properly
Augie Fackler <durin42@gmail.com>
parents: 381
diff changeset
36 svnadmin dump temp/repo > most-recent-is-edit-tag.svndump
381
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
37 echo
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
38 echo 'Complete.'
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
39 echo 'You probably want to clean up temp now.'
474
63cb630d667d tags: handle the most recent commit being an edit to an svn tag properly
Augie Fackler <durin42@gmail.com>
parents: 381
diff changeset
40 echo 'Dump in most-recent-is-edit-tag.svndump'
381
a441ba143ac8 tags: fix handling for certain nonstandard tag layouts.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
41 exit 0