Mercurial > hgsubversion
view tests/fixtures/branchtagcollision.sh @ 1170:61d4fb78370b stable
pull: fix pull when phases.new-commit=secret
This was causing subtle failures during pull. I believe the line where
we manually "set phase to public" isn't required any more, but more
work is required to verify that behavior on all versions of hg, so
we'll do that as a followup on default if needed.
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Fri, 04 Apr 2014 21:27:55 -0400 |
parents | f28e0f54a6ef |
children |
line wrap: on
line source
#!/bin/bash # # Generate branchtagcollision.svndump # # Generates an svn repository with a branch and a tag that have the same name. mkdir temp cd temp svnadmin create testrepo svn checkout file://`pwd`/testrepo client cd client mkdir trunk mkdir branches mkdir tags svn add trunk branches tags svn commit -m "Initial commit" echo "fileA" >> trunk/fileA svn add trunk/fileA svn commit -m "Added fileA" svn cp trunk branches/A svn commit -m "added branch" echo "fileB" >> trunk/fileB svn add trunk/fileB svn commit -m "Added fileB" svn cp trunk tags/A svn commit -m "added bad tag" cd .. svnadmin dump testrepo > ../branchtagcollision.svndump