annotate tests/fixtures/tag_name_same_as_branch.sh @ 1340:db9d85618d3d

wrapper: delay marker creation in push Before this patch we were creating obsolescence markers when pulling the changesets from subversion. The counterpart stripping logic (when obsolescence is not available) was done after pushing everything. This patch moves the marker creation to the end of the push, to: 1) Make the code more readable (the marker creation and the stripping should be in the same place) 2) Fix a behavior issue with inhibit(evolve) (see below) With inhibit + hgsubversion enabled. When pushing to subversion we were creating markers as expected but inhibiting the marker on the commit that was the parent of the working copy making it therefore visible. By delaying the marker creation to after the update we avoid this issue.
author Laurent Charignon <lcharignon@fb.com>
date Wed, 08 Jul 2015 13:30:16 -0700
parents a8811c84e3ee
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
389
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 #!/bin/sh
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
2 mkdir temp
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
3 cd temp
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
4 svnadmin create repo
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
5 REPOPATH="file://`pwd`/repo"
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
6 svn co $REPOPATH wc
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
7 cd wc
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
8 mkdir -p branches/magic trunk tags
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
9 svn add *
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
10 svn ci -m 'btt'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
11 cd branches/magic
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
12 for a in alpha beta gamma delta iota zeta eta theta ; do
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
13 echo $a > $a
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
14 svn add $a
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
15 svn ci -m "Add file $a"
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
16 done
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
17 cd ../..
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
18 svn up
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
19 svn cp $REPOPATH/branches/magic $REPOPATH/tags/magic -m 'Make magic tag'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
20 svn rm $REPOPATH/branches/magic/theta -m 'remove a file'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
21 svn cp $REPOPATH/branches/magic $REPOPATH/tags/magic2 -m 'Tag magic again'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
22
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
23 cd ../..
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
24 svnadmin dump temp/repo > tag_name_same_as_branch.svndump
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
25 echo
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
26 echo 'Complete.'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
27 echo 'You probably want to clean up temp now.'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
28 echo 'Dump in tag_name_same_as_branch.svndump'
a8811c84e3ee tags: Fix an improper parent calculation.
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
29 exit 0