Mercurial > hgsubversion
annotate .hgignore @ 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 | e42a05915edf |
children | 60324fc7e4d7 |
rev | line source |
---|---|
0
f2636cfed115
Initial import of hgsubversion into a public repository.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 syntax:glob |
340
88ba55ad58c0
Minor tweaks to wrapper documentation.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
319
diff
changeset
|
2 build |
0
f2636cfed115
Initial import of hgsubversion into a public repository.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
3 *.pyc |
292
761b095c11fb
Also ignore .pyo files.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
137
diff
changeset
|
4 *.pyo |
0
f2636cfed115
Initial import of hgsubversion into a public repository.
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
5 .DS_Store |
21
8626f3d2e50b
Add a small stack of tests that exercise some of the interesting special cases.
Augie Fackler <durin42@gmail.com>
parents:
0
diff
changeset
|
6 *.swp |
54
db7a1ab8851a
.hgignore: ignore emacs temporary files
Patrick Mezard <pmezard@gmail.com>
parents:
21
diff
changeset
|
7 *~ |
21
8626f3d2e50b
Add a small stack of tests that exercise some of the interesting special cases.
Augie Fackler <durin42@gmail.com>
parents:
0
diff
changeset
|
8 .coverage |
137
904a4b08f70f
.hgignore: ignore nose coverage html.
Augie Fackler <durin42@gmail.com>
parents:
61
diff
changeset
|
9 cover |
61
243c88c47d89
Ignore coverage information.
Augie Fackler <durin42@gmail.com>
parents:
54
diff
changeset
|
10 *.py,cover |
319
9c10656ce71e
Ignore distutils generated files.
Augie Fackler <durin42@gmail.com>
parents:
292
diff
changeset
|
11 MANIFEST |
9c10656ce71e
Ignore distutils generated files.
Augie Fackler <durin42@gmail.com>
parents:
292
diff
changeset
|
12 dist |
353
1ad05cffb20f
setup.py: Use setuptools if available.
Augie Fackler <durin42@gmail.com>
parents:
340
diff
changeset
|
13 *.egg-info |
525
6b084ea39537
hgignore: ignore the version file
Augie Fackler <durin42@gmail.com>
parents:
353
diff
changeset
|
14 hgsubversion/__version__.py |
823 | 15 nbproject |
824
38ebdf65d868
Ignore eclipse project files and mercurial .orig files.
Yonggang Luo <luoyonggang@gmail.com>
parents:
525
diff
changeset
|
16 .project |
38ebdf65d868
Ignore eclipse project files and mercurial .orig files.
Yonggang Luo <luoyonggang@gmail.com>
parents:
525
diff
changeset
|
17 .pydevproject |
38ebdf65d868
Ignore eclipse project files and mercurial .orig files.
Yonggang Luo <luoyonggang@gmail.com>
parents:
525
diff
changeset
|
18 .settings |
38ebdf65d868
Ignore eclipse project files and mercurial .orig files.
Yonggang Luo <luoyonggang@gmail.com>
parents:
525
diff
changeset
|
19 *.orig |
909
e42a05915edf
Add .noseids to the .hgignore
David Schleimer <dschleimer@fb.com>
parents:
903
diff
changeset
|
20 .noseids |
903
fd9397c863d4
ignore the temp fixtures directory
Bryan O'Sullivan <bryano@fb.com>
parents:
830
diff
changeset
|
21 tests/fixtures/temp |