blob: 39e7a86891495efb10b07f8968d9832a08401462 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
*****************
Dealing with spam
*****************
In the case that some spam or inappropriate comment makes its way
through you interface, you can (sometimes) remove the offending commit
``XYZ``.
If the offending commit is the last commit
==========================================
+-------+----------------------------+
| arch | |
+-------+----------------------------+
| bzr | bzr uncommit && bzr revert |
+-------+----------------------------+
| darcs | darcs obliterate --last=1 |
+-------+----------------------------+
| git | git reset --hard HEAD^ |
+-------+----------------------------+
| hg | hg rollback && hg revert |
+-------+----------------------------+
If the offending commit is not the last commit
==============================================
+----------+-----------------------------------------------+
| arch | |
+----------+-----------------------------------------------+
| bzr [#]_ | bzr rebase -r <XYZ+1>..-1 --onto before:XYZ . |
+----------+-----------------------------------------------+
| darcs | darcs obliterate --matches 'name XYZ' |
+----------+-----------------------------------------------+
| git | git rebase --onto XYZ~1 XYZ |
+----------+-----------------------------------------------+
| hg [#]_ | |
+----------+-----------------------------------------------+
.. [#] Requires the ```bzr-rebase`` plugin`_. Note, you have to
increment ``XYZ`` by hand for ``<XYZ+1>``, because ``bzr`` does not
support ``after:XYZ``.
.. [#] From `Mercurial: The Definitive Guide`:
"Mercurial also does not provide a way to make a file or
changeset completely disappear from history, because there is no
way to enforce its disappearance"
.. _bzr-rebase plugin: http://wiki.bazaar.canonical.com/Rebase
.. _Mercurial: The Definitive Guide:
http://hgbook.red-bean.com/read/finding-and-fixing-mistakes.html#id394667
Warnings about changing history
===============================
Note that all of these *change the repo history* , so only do this on
your interface-specific repo before it interacts with any other repo.
Otherwise, you'll have to survive by cherry-picking only the good
commits.
|
