Mercurial > public > mercurial-scm > hg
annotate tests/histedit-helpers.sh @ 31257:11831d755b51
merge: remove uses of manifest.matches
This gets rid of the manifest.matches calls in merge.py in favor of the new api.
This is part of getting rid of manifest.matches since it is O(manifest).
author | Durham Goode <durham@fb.com> |
---|---|
date | Tue, 07 Mar 2017 18:38:20 -0800 |
parents | 890273343170 |
children |
rev | line source |
---|---|
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
1 fixbundle() { |
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
2 grep -v 'saving bundle' | grep -v 'saved backup' | \ |
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
3 grep -v added | grep -v adding | \ |
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
4 grep -v "unable to find 'e' for patching" | \ |
27350
890273343170
tests: histedit-helpers fixbundle should not complain about no input
timeless <timeless@mozdev.org>
parents:
17085
diff
changeset
|
5 grep -v "e: No such file or directory" | \ |
890273343170
tests: histedit-helpers fixbundle should not complain about no input
timeless <timeless@mozdev.org>
parents:
17085
diff
changeset
|
6 cat |
17064
168cc52ad7c2
histedit: new extension for interactive history editing
Augie Fackler <raf@durin42.com>
parents:
diff
changeset
|
7 } |