Mercurial > hgsubversion
view tests/fixtures/subprojects.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 | 9a7e3dbd0f6e |
children |
line wrap: on
line source
#!/usr/bin/env bash set -e mkdir temp cd temp svnadmin create testrepo svn checkout file://`pwd`/testrepo client cd client mkdir trunk mkdir -p branches mkdir -p tags svn add trunk branches tags svn commit -m "Initial commit" mkdir trunk/project trunk/other echo "project trunk" > trunk/project/file echo "other trunk" > trunk/other/phile svn add trunk/project trunk/other svn commit -m "Added file and phile in trunk" svn up svn cp trunk tags/tag_from_trunk svn ci -m 'created tag from trunk' svn up svn cp trunk branches/branch svn ci -m 'created branch from trunk' svn up echo "project branch" > branches/branch/project/file svn ci -m "committed to the project branch" svn up echo "trunk2" > trunk/project/file svn ci -m "committed to trunk again" svn up echo "other branch" > branches/branch/other/phile svn ci -m "committed to the other branch" svn up svn cp branches/branch tags/tag_from_branch svn ci -m "create tag from branch" cd .. svnadmin dump testrepo > ../subprojects.svndump echo "Created subprojects.svndump" echo "You might want to clean up ${PWD} now"