annotate .hgtags @ 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 78ffbe411695
children 109c412ecf12
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
554
d2d5c09b33d0 Added tag 1.0 for changeset 97f2079e3778
Augie Fackler <durin42@gmail.com>
parents:
diff changeset
1 97f2079e3778511944ffb6a662520580650a3993 1.0
564
7bd457ec4e5e Added tag 1.0.1 for changeset 09c016174e33
Augie Fackler <durin42@gmail.com>
parents: 554
diff changeset
2 09c016174e332eceda015d3f43d96d7e0228acf3 1.0.1
592
b4c3afc95420 Added tag 1.1 for changeset 4359ddd73b00
Augie Fackler <durin42@gmail.com>
parents: 564
diff changeset
3 4359ddd73b009fbb356c52ea5d99cba25222ee7a 1.1
627
faba8e636960 Added tag 1.1.1 for changeset 8e621dbb82d4
Augie Fackler <durin42@gmail.com>
parents: 592
diff changeset
4 8e621dbb82d4363a85317638ad237e2817c56347 1.1.1
631
493023041e74 Added tag 1.1.2 for changeset 093ae2915b45
Augie Fackler <durin42@gmail.com>
parents: 627
diff changeset
5 093ae2915b452539b44390ee4ea14987484e1eee 1.1.2
738
2ddb95cd36dd Added tag 1.2 for changeset 708234ad6c97
Augie Fackler <durin42@gmail.com>
parents: 631
diff changeset
6 708234ad6c97fb52417e0b46a86c8373e25123a5 1.2
788
836aa282f1f8 Added tag 1.2.1 for changeset 4bbc6bf947f5
Augie Fackler <durin42@gmail.com>
parents: 738
diff changeset
7 4bbc6bf947f56a92e95a04a27b94a9f72d5482d7 1.2.1
838
efc86b40e915 Added tag 1.3 for changeset 0cbf9fd89672
Augie Fackler <durin42@gmail.com>
parents: 788
diff changeset
8 0cbf9fd89672e73165e1bb4db1ec8f7f65b95c94 1.3
883
78ffbe411695 Added tag 1.4 for changeset 07234759a3f7
Augie Fackler <raf@durin42.com>
parents: 838
diff changeset
9 07234759a3f750029ccaa001837d42fa12dd33ee 1.4