Mercurial > hg
annotate tests/histedit-helpers.sh @ 44909:d452acc8cce8 stable
flags: account for flag change when tracking rename relevant to merge
There are some logic filtering rename to the one relevant to the merge. That
logic was oblivious of flag change, leading to exec flag being dropped when
merged with a renamed.
There are two others bugs affecting this scenario. This patch fix the was where
there is not modification involved except for the flag change. Fixes for the
other bug are coming in later changesets.
Differential Revision: https://phab.mercurial-scm.org/D8531
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 16 May 2020 20:37:56 +0200 |
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 } |