Mercurial > hgsubversion
annotate tools/verify-all-heads.sh @ 933:a9f315eae67c
push: use native rebase instead of our rebase wrapper
Our rebase wrapper doesn't quite do the right thing with repect to a
just-pushed revision. In particular, it will try to rebase the
just-pushed revision on top of the version of that revision we just
pulled down from svn. This will sometimes result in a local revision
with an identical commit message as the revision from svn, but no file
changes.
This changes the rebase portion of the push command to instead use the
native rebase with a revset that excludes the revision we just pushed
to svn from the set to be rebased. It also moves to a single strip
operation that removes all of the revisions based on a pre-push or
partially pushed revision. This moves to a separate rebase and strip
operation since we now need to strip revisions we are not rebasing.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Mon, 24 Sep 2012 10:18:28 -0700 |
parents | 11c4c7242a36 |
children |
rev | line source |
---|---|
210
b81e7f2f7818
Add a shell script to verify the conversion result for all heads in a multi-branch repo.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 #!/bin/sh |
213
b1d2ea765516
tools: refactor stuff into common.sh, make verify-all-heads not revert.
Augie Fackler <durin42@gmail.com>
parents:
210
diff
changeset
|
2 . $(dirname $0)/common.sh |
b1d2ea765516
tools: refactor stuff into common.sh, make verify-all-heads not revert.
Augie Fackler <durin42@gmail.com>
parents:
210
diff
changeset
|
3 |
396
11c4c7242a36
tools: use new svn verify command instead of svn export incantations
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
388
diff
changeset
|
4 for b in `hg branches -aq` ; do |
210
b81e7f2f7818
Add a shell script to verify the conversion result for all heads in a multi-branch repo.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
5 hg co $b || break |
396
11c4c7242a36
tools: use new svn verify command instead of svn export incantations
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
388
diff
changeset
|
6 echo verifying $b |
11c4c7242a36
tools: use new svn verify command instead of svn export incantations
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
388
diff
changeset
|
7 hg svn verify |
210
b81e7f2f7818
Add a shell script to verify the conversion result for all heads in a multi-branch repo.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
8 done |