( )⚙ D10634 tests: run python script through quoted interpreter instead of directly

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10634

tests: run python script through quoted interpreter instead of directly
ClosedPublic

Authored by mharbison72 on May 3 2021, 2:22 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7383df4f6e19: tests: run python script through quoted interpreter instead of directly
Summary

This helps Windows when python is installed to %PROGRAMFILES%.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

mharbison72 created this revision.May 3 2021, 2:22 PM
Alphare accepted this revision.May 6 2021, 12:27 PM
This revision is now accepted and ready to land.May 6 2021, 12:27 PM
baymax updated this revision to Diff 27673.May 6 2021, 1:17 PM

✅ refresh by Heptapod after a successful CI run (🐙 💚)
⚠ This patch is intended for stable ⚠

Revision Contents
Changeset List

PathPackages
Mtests/test-copies-chain-merge.t (27 lines)

Diff 27673

tests/test-copies-chain-merge.t

> import sys > import sys
> for line in sys.stdin: > for line in sys.stdin:
> if " linkrev " in line: > if " linkrev " in line:
> print(line.rstrip()) > print(line.rstrip())
> else: > else:
> l = "%s *%s" % (line[:6], line[14:].rstrip()) > l = "%s *%s" % (line[:6], line[14:].rstrip())
> print(l) > print(l)
> EOF > EOF
$ chmod +x no-linkrev
$ cat << EOF >> $HGRCPATH $ cat << EOF >> $HGRCPATH
> [diff] > [diff]
> git=yes > git=yes
> [command-templates] > [command-templates]
> log={desc}\n > log={desc}\n
> EOF > EOF
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
2 files updated, 0 files merged, 1 files removed, 0 files unresolved 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg mv h i $ hg mv h i
$ hg commit -m "f-1: rename h -> i" $ hg commit -m "f-1: rename h -> i"
created new head created new head
$ hg mv --force i d $ hg mv --force i d
$ hg commit -m "f-2: rename i -> d" $ hg commit -m "f-2: rename i -> d"
$ hg debugindex d | ../no-linkrev $ hg debugindex d | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !)
0 * ae258f702dfe 000000000000 000000000000 (changeset !) 0 * ae258f702dfe 000000000000 000000000000 (changeset !)
1 * b004912a8510 000000000000 000000000000 1 * b004912a8510 000000000000 000000000000
2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !) 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !) 3 files updated, 0 files merged, 0 files removed, 0 files unresolved (no-changeset !)
2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !) 2 files updated, 0 files merged, 0 files removed, 0 files unresolved (changeset !)
$ hg up 'desc("i-2")' $ hg up 'desc("i-2")'
6 files updated, 0 files merged, 0 files removed, 0 files unresolved 6 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg mv r x $ hg mv r x
$ hg commit -m "r-1: rename r -> x" $ hg commit -m "r-1: rename r -> x"
created new head created new head
$ hg mv --force x t $ hg mv --force x t
$ hg commit -m "r-2: rename t -> x" $ hg commit -m "r-2: rename t -> x"
$ hg debugindex t | ../no-linkrev $ hg debugindex t | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * d74efbf65309 000000000000 000000000000 (no-changeset !) 0 * d74efbf65309 000000000000 000000000000 (no-changeset !)
1 * 02a930b9d7ad 000000000000 000000000000 (no-changeset !) 1 * 02a930b9d7ad 000000000000 000000000000 (no-changeset !)
0 * 5aed6a8dbff0 000000000000 000000000000 (changeset !) 0 * 5aed6a8dbff0 000000000000 000000000000 (changeset !)
1 * a38b2fa17021 000000000000 000000000000 (changeset !) 1 * a38b2fa17021 000000000000 000000000000 (changeset !)
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
3 files updated, 0 files merged, 0 files removed, 0 files unresolved 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg merge 'desc("r-2")' $ hg merge 'desc("r-2")'
- one overwriting a file (d) with a rename (from h to i to d) - one overwriting a file (d) with a rename (from h to i to d)
- the merge update f content - the merge update f content
$ case_desc="merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)" $ case_desc="merge with extra change - B side: unrelated change, F side: overwrite d with a copy (from h->i->d)"
$ hg up 'desc("f-2")' $ hg up 'desc("f-2")'
2 files updated, 0 files merged, 2 files removed, 0 files unresolved 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
#if no-changeset #if no-changeset
$ hg debugindex d | ../no-linkrev $ hg debugindex d | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * d8252ab2e760 000000000000 000000000000 0 * d8252ab2e760 000000000000 000000000000
1 * b004912a8510 000000000000 000000000000 1 * b004912a8510 000000000000 000000000000
2 * 7b79e2fe0c89 000000000000 000000000000 2 * 7b79e2fe0c89 000000000000 000000000000
3 * 17ec97e60577 d8252ab2e760 000000000000 3 * 17ec97e60577 d8252ab2e760 000000000000
4 * 06dabf50734c b004912a8510 17ec97e60577 4 * 06dabf50734c b004912a8510 17ec97e60577
5 * 19c0e3924691 17ec97e60577 b004912a8510 5 * 19c0e3924691 17ec97e60577 b004912a8510
6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577
7 * d55cb4e9ef57 000000000000 000000000000 7 * d55cb4e9ef57 000000000000 000000000000
#else #else
$ hg debugindex d | ../no-linkrev $ hg debugindex d | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * ae258f702dfe 000000000000 000000000000 0 * ae258f702dfe 000000000000 000000000000
1 * b004912a8510 000000000000 000000000000 1 * b004912a8510 000000000000 000000000000
2 * 5cce88bf349f ae258f702dfe 000000000000 2 * 5cce88bf349f ae258f702dfe 000000000000
3 * cc269dd788c8 b004912a8510 5cce88bf349f 3 * cc269dd788c8 b004912a8510 5cce88bf349f
4 * 51c91a115080 5cce88bf349f b004912a8510 4 * 51c91a115080 5cce88bf349f b004912a8510
#endif #endif
$ hg up 'desc("b-1")' $ hg up 'desc("b-1")'
(branch merge, don't forget to commit) (branch merge, don't forget to commit)
$ echo "extra-change to (formelly h) during the merge" > d $ echo "extra-change to (formelly h) during the merge" > d
$ hg ci -m "mFB-change-m-0 $case_desc - the other way" $ hg ci -m "mFB-change-m-0 $case_desc - the other way"
created new head created new head
$ hg manifest --rev . --debug | grep " d" $ hg manifest --rev . --debug | grep " d"
1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !) 1c334238bd42ec85c6a0d83fd1b2a898a6a3215d 644 d (no-changeset !)
cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !) cea2d99c0fde64672ef61953786fdff34f16e230 644 d (changeset !)
#if no-changeset #if no-changeset
$ hg debugindex d | ../no-linkrev $ hg debugindex d | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * d8252ab2e760 000000000000 000000000000 0 * d8252ab2e760 000000000000 000000000000
1 * b004912a8510 000000000000 000000000000 1 * b004912a8510 000000000000 000000000000
2 * 7b79e2fe0c89 000000000000 000000000000 2 * 7b79e2fe0c89 000000000000 000000000000
3 * 17ec97e60577 d8252ab2e760 000000000000 3 * 17ec97e60577 d8252ab2e760 000000000000
4 * 06dabf50734c b004912a8510 17ec97e60577 4 * 06dabf50734c b004912a8510 17ec97e60577
5 * 19c0e3924691 17ec97e60577 b004912a8510 5 * 19c0e3924691 17ec97e60577 b004912a8510
6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577 6 * 89c873a01d97 7b79e2fe0c89 17ec97e60577
7 * d55cb4e9ef57 000000000000 000000000000 7 * d55cb4e9ef57 000000000000 000000000000
8 * 1c334238bd42 7b79e2fe0c89 000000000000 8 * 1c334238bd42 7b79e2fe0c89 000000000000
#else #else
$ hg debugindex d | ../no-linkrev $ hg debugindex d | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * ae258f702dfe 000000000000 000000000000 0 * ae258f702dfe 000000000000 000000000000
1 * b004912a8510 000000000000 000000000000 1 * b004912a8510 000000000000 000000000000
2 * 5cce88bf349f ae258f702dfe 000000000000 2 * 5cce88bf349f ae258f702dfe 000000000000
3 * cc269dd788c8 b004912a8510 5cce88bf349f 3 * cc269dd788c8 b004912a8510 5cce88bf349f
4 * 51c91a115080 5cce88bf349f b004912a8510 4 * 51c91a115080 5cce88bf349f b004912a8510
5 * cea2d99c0fde ae258f702dfe 000000000000 5 * cea2d99c0fde ae258f702dfe 000000000000
#endif #endif
$ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d' $ hg manifest --debug --rev 'desc("mDBm-0")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("d-2")' | grep '644 d' $ hg manifest --debug --rev 'desc("d-2")' | grep '644 d'
b004912a8510032a0350a74daa2803dadfb00e12 644 d b004912a8510032a0350a74daa2803dadfb00e12 644 d
$ hg manifest --debug --rev 'desc("b-1")' | grep '644 d' $ hg manifest --debug --rev 'desc("b-1")' | grep '644 d'
d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !) d8252ab2e760b0d4e5288fd44cbd15a0fa567e16 644 d (no-changeset !)
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !) ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 d (changeset !)
$ hg debugindex d | head -n 4 | ../no-linkrev $ hg debugindex d | head -n 4 | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * d8252ab2e760 000000000000 000000000000 (no-changeset !) 0 * d8252ab2e760 000000000000 000000000000 (no-changeset !)
0 * ae258f702dfe 000000000000 000000000000 (changeset !) 0 * ae258f702dfe 000000000000 000000000000 (changeset !)
1 * b004912a8510 000000000000 000000000000 1 * b004912a8510 000000000000 000000000000
2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !) 2 * 7b79e2fe0c89 000000000000 000000000000 (no-changeset !)
2 * 5cce88bf349f ae258f702dfe 000000000000 (changeset !) 2 * 5cce88bf349f ae258f702dfe 000000000000 (changeset !)
Log output should not include a merge commit as it did not happen Log output should not include a merge commit as it did not happen
$ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
2ff93c643948464ee1f871867910ae43a45b0bea 644 f 2ff93c643948464ee1f871867910ae43a45b0bea 644 f
$ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f'
2ff93c643948464ee1f871867910ae43a45b0bea 644 f 2ff93c643948464ee1f871867910ae43a45b0bea 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
e8825b386367b29fec957283a80bb47b47483fe1 644 f e8825b386367b29fec957283a80bb47b47483fe1 644 f
$ hg debugindex f | ../no-linkrev $ hg debugindex f | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * b76eb76580df 000000000000 000000000000 0 * b76eb76580df 000000000000 000000000000
1 * e8825b386367 000000000000 000000000000 1 * e8825b386367 000000000000 000000000000
2 * 2ff93c643948 b76eb76580df e8825b386367 2 * 2ff93c643948 b76eb76580df e8825b386367
3 * 2f649fba7eb2 b76eb76580df e8825b386367 3 * 2f649fba7eb2 b76eb76580df e8825b386367
4 * 774e7c1637d5 e8825b386367 b76eb76580df 4 * 774e7c1637d5 e8825b386367 b76eb76580df
#else #else
$ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAEm-0")' | grep '644 f'
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
$ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEAm-0")' | grep '644 f'
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
$ hg debugindex f | ../no-linkrev $ hg debugindex f | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * ae258f702dfe 000000000000 000000000000 0 * ae258f702dfe 000000000000 000000000000
1 * d3613c1ec831 ae258f702dfe 000000000000 1 * d3613c1ec831 ae258f702dfe 000000000000
2 * 05e03c868bbc ae258f702dfe 000000000000 2 * 05e03c868bbc ae258f702dfe 000000000000
#endif #endif
# Here the filelog based implementation is not looking at the rename # Here the filelog based implementation is not looking at the rename
# information (because the file exist on both side). However the changelog # information (because the file exist on both side). However the changelog
$ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v' $ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v'
0946c662ef16e4e67397fd717389eb6693d41749 644 v 0946c662ef16e4e67397fd717389eb6693d41749 644 v
$ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v' $ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v'
0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644 v 0db3aad7fcc1ec27fab57060e327b9e864ea0cc9 644 v
$ hg manifest --debug --rev 'desc("p-2")' | grep '644 v' $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v'
3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644 v 3f91841cd75cadc9a1f1b4e7c1aa6d411f76032e 644 v
$ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v'
c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v c43c088b811fd27983c0a9aadf44f3343cd4cd7e 644 v
$ hg debugindex v | ../no-linkrev $ hg debugindex v | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * 3f91841cd75c 000000000000 000000000000 0 * 3f91841cd75c 000000000000 000000000000
1 * c43c088b811f 000000000000 000000000000 1 * c43c088b811f 000000000000 000000000000
2 * 0946c662ef16 3f91841cd75c c43c088b811f 2 * 0946c662ef16 3f91841cd75c c43c088b811f
3 * 0db3aad7fcc1 c43c088b811f 3f91841cd75c 3 * 0db3aad7fcc1 c43c088b811f 3f91841cd75c
#else #else
$ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v' $ hg manifest --debug --rev 'desc("mPQm-0")' | grep '644 v'
65fde9f6e4d4da23b3f610e07b53673ea9541d75 644 v 65fde9f6e4d4da23b3f610e07b53673ea9541d75 644 v
$ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v' $ hg manifest --debug --rev 'desc("mQPm-0")' | grep '644 v'
a098dda6413aecf154eefc976afc38b295acb7e5 644 v a098dda6413aecf154eefc976afc38b295acb7e5 644 v
$ hg manifest --debug --rev 'desc("p-2")' | grep '644 v' $ hg manifest --debug --rev 'desc("p-2")' | grep '644 v'
5aed6a8dbff0301328c08360d24354d3d064cf0d 644 v 5aed6a8dbff0301328c08360d24354d3d064cf0d 644 v
$ hg manifest --debug --rev 'desc("q-2")' | grep '644 v' $ hg manifest --debug --rev 'desc("q-2")' | grep '644 v'
a38b2fa170219750dac9bc7d19df831f213ba708 644 v a38b2fa170219750dac9bc7d19df831f213ba708 644 v
$ hg debugindex v | ../no-linkrev $ hg debugindex v | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * 5aed6a8dbff0 000000000000 000000000000 0 * 5aed6a8dbff0 000000000000 000000000000
1 * a38b2fa17021 000000000000 000000000000 1 * a38b2fa17021 000000000000 000000000000
2 * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021 2 * 65fde9f6e4d4 5aed6a8dbff0 a38b2fa17021
3 * a098dda6413a a38b2fa17021 5aed6a8dbff0 3 * a098dda6413a a38b2fa17021 5aed6a8dbff0
#endif #endif
# Here the filelog based implementation is not looking at the rename # Here the filelog based implementation is not looking at the rename
$ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f'
2f649fba7eb284e720d02b61f0546fcef694c045 644 f 2f649fba7eb284e720d02b61f0546fcef694c045 644 f
$ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644 f'
774e7c1637d536b99e2d8ef16fd731f87a82bd09 644 f 774e7c1637d536b99e2d8ef16fd731f87a82bd09 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f b76eb76580df486c3d51d63c5c210d4dd43a8ac7 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
e8825b386367b29fec957283a80bb47b47483fe1 644 f e8825b386367b29fec957283a80bb47b47483fe1 644 f
$ hg debugindex f | ../no-linkrev $ hg debugindex f | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * b76eb76580df 000000000000 000000000000 0 * b76eb76580df 000000000000 000000000000
1 * e8825b386367 000000000000 000000000000 1 * e8825b386367 000000000000 000000000000
2 * 2ff93c643948 b76eb76580df e8825b386367 2 * 2ff93c643948 b76eb76580df e8825b386367
3 * 2f649fba7eb2 b76eb76580df e8825b386367 3 * 2f649fba7eb2 b76eb76580df e8825b386367
4 * 774e7c1637d5 e8825b386367 b76eb76580df 4 * 774e7c1637d5 e8825b386367 b76eb76580df
#else #else
$ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mAE-change-m-0")' | grep '644 f'
d3613c1ec8310a812ac4268fd853ac576b6caea5 644 f d3613c1ec8310a812ac4268fd853ac576b6caea5 644 f
$ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644 f' $ hg manifest --debug --rev 'desc("mEA-change-m-0")' | grep '644 f'
05e03c868bbcab4a649cb33a238d7aa07398a469 644 f 05e03c868bbcab4a649cb33a238d7aa07398a469 644 f
$ hg manifest --debug --rev 'desc("a-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("a-2")' | grep '644 f'
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
$ hg manifest --debug --rev 'desc("e-2")' | grep '644 f' $ hg manifest --debug --rev 'desc("e-2")' | grep '644 f'
ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f ae258f702dfeca05bf9b6a22a97a4b5645570f11 644 f
$ hg debugindex f | ../no-linkrev $ hg debugindex f | "$PYTHON" ../no-linkrev
rev linkrev nodeid p1 p2 rev linkrev nodeid p1 p2
0 * ae258f702dfe 000000000000 000000000000 0 * ae258f702dfe 000000000000 000000000000
1 * d3613c1ec831 ae258f702dfe 000000000000 1 * d3613c1ec831 ae258f702dfe 000000000000
2 * 05e03c868bbc ae258f702dfe 000000000000 2 * 05e03c868bbc ae258f702dfe 000000000000
#endif #endif
# Here the filelog based implementation is not looking at the rename # Here the filelog based implementation is not looking at the rename
# information (because the file exist on both side). However the changelog # information (because the file exist on both side). However the changelog