Mercurial > public > mercurial-scm > hg

annotate tests/test-merge-no-file-change.t @ 45892:06b64fabf91c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: cache the ancestor checking call when tracing copy A good share of the time spent in this function is spent doing ancestors checking. To avoid spending time in duplicated call, we cache the result of calls. In the slower case, this provide a quite significant performance boost. Below are the result for a set of selected pairs (many of them pathological): (And further down is another table that summarize the current state of filelog based vs changeset base copy tracing) The benchmark have been configured to be killed after 6 minutes of runtime, which mean that any detect slower than 2 minutes will be marked as "killed". This drop some useful information about how much slower these case are? but also prevent 99% of the benchmark time to be spent on case that can be labelled "very slow" anyway. Repo Case Source-Rev Dest-Rev Old-Time New-Time Difference Factor ------------------------------------------------------------------------------------------------------------------------------------ mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000044 s, 0.000044 s, +0.000000 s, ? 1.0000 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.000138 s, 0.000138 s, +0.000000 s, ? 1.0000 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.005067 s, 0.005052 s, -0.000015 s, ? 0.9970 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.000218 s, 0.000219 s, +0.000001 s, ? 1.0046 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.000053 s, 0.000055 s, +0.000002 s, ? 1.0377 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.000125 s, 0.000128 s, +0.000003 s, ? 1.0240 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.001098 s, 0.001089 s, -0.000009 s, ? 0.9918 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.017546 s, 0.017407 s, -0.000139 s, ? 0.9921 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 0.096723 s, 0.094175 s, -0.002548 s, ? 0.9737 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 0.271796 s, 0.238009 s, -0.033787 s, ? 0.8757 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 0.128602 s, 0.125876 s, -0.002726 s, ? 0.9788 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 7.086742 s, 3.581556 s, -3.505186 s, ? 0.5054 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 0.016634 s, 0.016721 s, +0.000087 s, ? 1.0052 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 0.254225 s, 0.242367 s, -0.011858 s, ? 0.9534 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.000166 s, 0.000165 s, -0.000001 s, ? 0.9940 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.000118 s, 0.000114 s, -0.000004 s, ? 0.9661 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.000296 s, 0.000296 s, +0.000000 s, ? 1.0000 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.001137 s, 0.001124 s, -0.000013 s, ? 0.9886 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.014133 s, 0.013060 s, -0.001073 s, ? 0.9241 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.016988 s, 0.017112 s, +0.000124 s, ? 1.0073 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.676361 s, 0.660350 s, -0.016011 s, ? 0.9763 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 12.515149 s, 10.032499 s, -2.482650 s, ? 0.8016 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.000186 s, 0.000189 s, +0.000003 s, ? 1.0161 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.000459 s, 0.000462 s, +0.000003 s, ? 1.0065 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.000273 s, 0.000270 s, -0.000003 s, ? 0.9890 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.001503 s, 0.001474 s, -0.000029 s, ? 0.9807 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.004862 s, 0.004806 s, -0.000056 s, ? 0.9885 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.088291 s, 0.085150 s, -0.003141 s, ? 0.9644 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007113 s, 0.007064 s, -0.000049 s, ? 0.9931 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004687 s, 0.004741 s, +0.000054 s, ? 1.0115 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 0.198710 s, 0.190133 s, -0.008577 s, ? 0.9568 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.036068 s, 0.035651 s, -0.000417 s, ? 0.9884 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 0.465362 s, 0.440694 s, -0.024668 s, ? 0.9470 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 24.519684 s, 18.454163 s, -6.065521 s, ? 0.7526 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 42.711897 s, 31.562719 s, -11.149178 s, ? 0.7390 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.001201 s, 0.001189 s, -0.000012 s, ? 0.9900 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.001216 s, 0.001204 s, -0.000012 s, ? 0.9901 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.000595 s, 0.000586 s, -0.000009 s, ? 0.9849 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.001856 s, 0.001845 s, -0.000011 s, ? 0.9941 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 0.064936 s, 0.063822 s, -0.001114 s, ? 0.9828 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 0.090601 s, 0.088038 s, -0.002563 s, ? 0.9717 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.007510 s, 0.007389 s, -0.000121 s, ? 0.9839 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.004911 s, 0.004868 s, -0.000043 s, ? 0.9912 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 0.233231 s, 0.222450 s, -0.010781 s, ? 0.9538 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.419989 s, 0.370675 s, -0.049314 s, ? 0.8826 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.401521 s, 0.358020 s, -0.043501 s, ? 0.8917 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 0.179555 s, 0.145235 s, -0.034320 s, ? 0.8089 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 0.038004 s, 0.037606 s, -0.000398 s, ? 0.9895 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 52.838482 s, 7.382439 s, -45.456043 s, ? 0.1397 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 8.705874 s, 7.273506 s, -1.432368 s, ? 0.8355 mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 1.126708 s, 1.074593 s, -0.052115 s, ? 0.9537 mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 83.854020 s, 27.746195 s, -56.107825 s, ? 0.3309 Below is a table comparing the runtime of the current "filelog centric" algorithm, with the "changeset centric" one, we just modified. The changeset centric algorithm is a significant win in many scenario, but they are still various cases where it is quite slower. When many revision has to be considered the cost of retrieving the copy information, creating new dictionaries, merging dictionaries and checking if revision are ancestors of each other can slow things down. The rest of this series, will introduce a rust version of the copy tracing code to deal with most of theses issues. Repo Case Source-Rev Dest-Rev filelog sidedata Difference Factor --------------------------------------------------------------------------------------------------------------------------------------- mercurial x_revs_x_added_0_copies ad6b123de1c7 39cfcef4f463 : 0.000914 s, 0.000044 s, - 0.000870 s, ? 0.048140 mercurial x_revs_x_added_x_copies 2b1c78674230 0c1d10351869 : 0.001812 s, 0.000138 s, - 0.001674 s, ? 0.076159 mercurial x000_revs_x000_added_x_copies 81f8ff2a9bf2 dd3267698d84 : 0.017954 s, 0.005052 s, - 0.012902 s, ? 0.281386 pypy x_revs_x_added_0_copies aed021ee8ae8 099ed31b181b : 0.001509 s, 0.000219 s, - 0.001290 s, ? 0.145129 pypy x_revs_x000_added_0_copies 4aa4e1f8e19a 359343b9ac0e : 0.206881 s, 0.000055 s, - 0.206826 s, ? 0.000266 pypy x_revs_x_added_x_copies ac52eb7bbbb0 72e022663155 : 0.016951 s, 0.000128 s, - 0.016823 s, ? 0.007551 pypy x_revs_x00_added_x_copies c3b14617fbd7 ace7255d9a26 : 0.019096 s, 0.001089 s, - 0.018007 s, ? 0.057028 pypy x_revs_x000_added_x000_copies df6f7a526b60 a83dc6a2d56f : 0.762506 s, 0.017407 s, - 0.745099 s, ? 0.022829 pypy x000_revs_xx00_added_0_copies 89a76aede314 2f22446ff07e : 1.179211 s, 0.094175 s, - 1.085036 s, ? 0.079863 pypy x000_revs_x000_added_x_copies 8a3b5bfd266e 2c68e87c3efe : 1.249058 s, 0.238009 s, - 1.011049 s, ? 0.190551 pypy x000_revs_x000_added_x000_copies 89a76aede314 7b3dda341c84 : 1.614107 s, 0.125876 s, - 1.488231 s, ? 0.077985 pypy x0000_revs_x_added_0_copies d1defd0dc478 c9cb1334cc78 : 0.001064 s, 3.581556 s, + 3.580492 s, ? 3366.124060 pypy x0000_revs_xx000_added_0_copies bf2c629d0071 4ffed77c095c : 1.061275 s, 0.016721 s, - 1.044554 s, ? 0.015756 pypy x0000_revs_xx000_added_x000_copies 08ea3258278e d9fa043f30c0 : 1.341119 s, 0.242367 s, - 1.098752 s, ? 0.180720 netbeans x_revs_x_added_0_copies fb0955ffcbcd a01e9239f9e7 : 0.027803 s, 0.000165 s, - 0.027638 s, ? 0.005935 netbeans x_revs_x000_added_0_copies 6f360122949f 20eb231cc7d0 : 0.130014 s, 0.000114 s, - 0.129900 s, ? 0.000877 netbeans x_revs_x_added_x_copies 1ada3faf6fb6 5a39d12eecf4 : 0.024990 s, 0.000296 s, - 0.024694 s, ? 0.011845 netbeans x_revs_x00_added_x_copies 35be93ba1e2c 9eec5e90c05f : 0.052201 s, 0.001124 s, - 0.051077 s, ? 0.021532 netbeans x000_revs_xx00_added_0_copies eac3045b4fdd 51d4ae7f1290 : 0.037642 s, 0.013060 s, - 0.024582 s, ? 0.346953 netbeans x000_revs_x000_added_x_copies e2063d266acd 6081d72689dc : 0.197086 s, 0.017112 s, - 0.179974 s, ? 0.086825 netbeans x000_revs_x000_added_x000_copies ff453e9fee32 411350406ec2 : 0.935148 s, 0.660350 s, - 0.274798 s, ? 0.706145 netbeans x0000_revs_xx000_added_x000_copies 588c2d1ced70 1aad62e59ddd : 3.920674 s, 10.032499 s, + 6.111825 s, ? 2.558871 mozilla-central x_revs_x_added_0_copies 3697f962bb7b 7015fcdd43a2 : 0.024232 s, 0.000189 s, - 0.024043 s, ? 0.007800 mozilla-central x_revs_x000_added_0_copies dd390860c6c9 40d0c5bed75d : 0.141483 s, 0.000462 s, - 0.141021 s, ? 0.003265 mozilla-central x_revs_x_added_x_copies 8d198483ae3b 14207ffc2b2f : 0.025775 s, 0.000270 s, - 0.025505 s, ? 0.010475 mozilla-central x_revs_x00_added_x_copies 98cbc58cc6bc 446a150332c3 : 0.084922 s, 0.001474 s, - 0.083448 s, ? 0.017357 mozilla-central x_revs_x000_added_x000_copies 3c684b4b8f68 0a5e72d1b479 : 0.194784 s, 0.004806 s, - 0.189978 s, ? 0.024673 mozilla-central x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.161103 s, 0.085150 s, - 2.075953 s, ? 0.039401 mozilla-central x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089347 s, 0.007064 s, - 0.082283 s, ? 0.079063 mozilla-central x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.732171 s, 0.004741 s, - 0.727430 s, ? 0.006475 mozilla-central x000_revs_x000_added_x000_copies 7c97034feb78 4407bd0c6330 : 1.157287 s, 0.190133 s, - 0.967154 s, ? 0.164292 mozilla-central x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.726568 s, 0.035651 s, - 6.690917 s, ? 0.005300 mozilla-central x0000_revs_xx000_added_x000_copies f78c615a656c 96a38b690156 : 3.266229 s, 0.440694 s, - 2.825535 s, ? 0.134924 mozilla-central x00000_revs_x0000_added_x0000_copies 6832ae71433c 4c222a1d9a00 : 15.860534 s, 18.454163 s, + 2.593629 s, ? 1.163527 mozilla-central x00000_revs_x00000_added_x000_copies 76caed42cf7c 1daa622bbe42 : 20.450475 s, 31.562719 s, +11.112244 s, ? 1.543373 mozilla-try x_revs_x_added_0_copies aaf6dde0deb8 9790f499805a : 0.080442 s, 0.001189 s, - 0.079253 s, ? 0.014781 mozilla-try x_revs_x000_added_0_copies d8d0222927b4 5bb8ce8c7450 : 0.497672 s, 0.001204 s, - 0.496468 s, ? 0.002419 mozilla-try x_revs_x_added_x_copies 092fcca11bdb 936255a0384a : 0.021183 s, 0.000586 s, - 0.020597 s, ? 0.027664 mozilla-try x_revs_x00_added_x_copies b53d2fadbdb5 017afae788ec : 0.230991 s, 0.001845 s, - 0.229146 s, ? 0.007987 mozilla-try x_revs_x000_added_x000_copies 20408ad61ce5 6f0ee96e21ad : 1.118461 s, 0.063822 s, - 1.054639 s, ? 0.057062 mozilla-try x_revs_x0000_added_x0000_copies effb563bb7e5 c07a39dc4e80 : 2.206083 s, 0.088038 s, - 2.118045 s, ? 0.039907 mozilla-try x000_revs_xx00_added_0_copies 6100d773079a 04a55431795e : 0.089404 s, 0.007389 s, - 0.082015 s, ? 0.082647 mozilla-try x000_revs_x000_added_x_copies 9f17a6fc04f9 2d37b966abed : 0.733043 s, 0.004868 s, - 0.728175 s, ? 0.006641 mozilla-try x000_revs_x000_added_x000_copies 1346fd0130e4 4c65cbdabc1f : 1.163367 s, 0.222450 s, - 0.940917 s, ? 0.191212 mozilla-try x0000_revs_x_added_0_copies 63519bfd42ee a36a2a865d92 : 0.085456 s, 0.370675 s, + 0.285219 s, ? 4.337612 mozilla-try x0000_revs_x_added_x_copies 9fe69ff0762d bcabf2a78927 : 0.083601 s, 0.358020 s, + 0.274419 s, ? 4.282485 mozilla-try x0000_revs_xx000_added_x_copies 156f6e2674f2 4d0f2c178e66 : 7.366614 s, 0.145235 s, - 7.221379 s, ? 0.019715 mozilla-try x0000_revs_xx000_added_0_copies 9eec5917337d 67118cc6dcad : 6.664464 s, 0.037606 s, - 6.626858 s, ? 0.005643 mozilla-try x0000_revs_xx000_added_x000_copies 89294cd501d9 7ccb2fc7ccb5 : 7.467836 s, 7.382439 s, - 0.085397 s, ? 0.988565 mozilla-try x0000_revs_x0000_added_x0000_copies e928c65095ed e951f4ad123a : 9.801294 s, 7.273506 s, - 2.527788 s, ? 0.742097 mozilla-try x00000_revs_x_added_0_copies 6a320851d377 1ebb79acd503 : 0.091886 s, killed mozilla-try x00000_revs_x00000_added_0_copies dc8a3ca7010e d16fde900c9c : 26.491140 s, 1.074593 s, -25.416547 s, ? 0.040564 mozilla-try x00000_revs_x_added_x_copies 5173c4b6f97c 95d83ee7242d : 0.092863 s, killed mozilla-try x00000_revs_x000_added_x_copies 9126823d0e9c ca82787bb23c : 0.226823 s, killed mozilla-try x00000_revs_x0000_added_x0000_copies 8d3fafa80d4b eb884023b810 : 18.914630 s, 27.746195 s, + 8.831565 s, ? 1.466917 mozilla-try x00000_revs_x00000_added_x0000_copies 1b661134e2ca 1ae03d022d6d : 21.198903 s, killed mozilla-try x00000_revs_x00000_added_x000_copies 9b2a99adc05e 8e29777b48e6 : 24.952268 s, killed Differential Revision: https://phab.mercurial-scm.org/D9296
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 02 Nov 2020 11:03:56 +0100
parents 8988e640a8ac
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
39110
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
1 $ cat <<'EOF' >> "$HGRCPATH"
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
2 > [extensions]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
3 > convert =
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
4 > [templates]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
5 > l = '{rev}:{node|short} p={p1rev},{p2rev} m={manifest} f={files|json}'
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
6 > EOF
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
7
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
8 $ check_convert_identity () {
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
9 > hg convert -q "$1" "$1.converted"
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
10 > hg outgoing -q -R "$1.converted" "$1"
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
11 > if [ "$?" != 1 ]; then
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
12 > echo '*** BUG: hash changes on convert ***'
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
13 > hg log -R "$1.converted" -GTl
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
14 > fi
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
15 > }
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
16
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
17 Files added at both parents:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
18
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
19 $ hg init added-both
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
20 $ cd added-both
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
21 $ touch a b c
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
22 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
23 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
24 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
25 $ hg ci -qAm2 c
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
26
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
27 $ hg merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
29 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
30 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
31 committing files:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
32 b
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 39110
diff changeset
33 not reusing manifest (no file change in changelog, but manifest differs)
39110
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
34 committing manifest
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
35 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
36 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
37 committed changeset 3:7aa8a293f5d97377037afc21e871e036e718d659
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
38 $ hg log -GTl
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
39 @ 3:7aa8a293f5d9 p=2,1 m=3:8667461869a1 f=[]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
40 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
41 | o 2:e0ea47086fce p=0,-1 m=2:b2e5b07f9374 f=["c"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
42 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
43 o | 1:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
44 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
45 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
46
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
47
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
48 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
49 $ check_convert_identity added-both
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
50
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
51 Files added at both parents, but the other removed at the merge:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
52 (In this case, ctx.files() after the commit contains the removed file "b", but
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
53 its manifest does not differ from p1.)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
54
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
55 $ hg init added-both-removed-at-merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
56 $ cd added-both-removed-at-merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
57 $ touch a b c
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
58 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
59 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
60 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
61 $ hg ci -qAm2 c
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
62
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
63 $ hg merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
64 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
65 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
66 $ hg rm -f b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
67 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
68 committing files:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
69 committing manifest
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
70 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
71 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
72 committed changeset 3:915745f3ca3d9d699925269474c2d0a9526e8dfa
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
73 $ hg log -GTl
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
74 @ 3:915745f3ca3d p=2,1 m=3:8e9cf3456921 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
75 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
76 | o 2:e0ea47086fce p=0,-1 m=2:b2e5b07f9374 f=["c"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
77 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
78 o | 1:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
79 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
80 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
81
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
82
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
83 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
84 $ check_convert_identity added-both
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
85
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
86 An identical file added at both parents:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
87
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
88 $ hg init added-identical
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
89 $ cd added-identical
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
90 $ touch a b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
91 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
92 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
93 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
94 $ touch b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
95 $ hg ci -qAm2 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
96
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
97 $ hg merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
98 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
99 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
100 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
101 reusing manifest from p1 (no file change)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
102 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
103 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
104 committed changeset 3:de26182cd210f0c3fb175ca7616704ab963d3024
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
105 $ hg log -GTl
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
106 @ 3:de26182cd210 p=2,1 m=1:686dbf0aeca4 f=[]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
107 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
108 | o 2:f00991f11eca p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
109 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
110 o | 1:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
111 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
112 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
113
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
114
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
115 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
116 $ check_convert_identity added-identical
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
117
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
118 #if execbit
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
119
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
120 An identical file added at both parents, but the flag differs. Take local:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
121
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
122 $ hg init flag-change-take-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
123 $ cd flag-change-take-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
124 $ touch a b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
125 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
126 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
127 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
128 $ touch b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
129 $ chmod +x b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
130 $ hg ci -qAm2 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
131
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
132 $ hg merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
133 warning: cannot merge flags for b without common ancestor - keeping local flags
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
134 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
135 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
136 $ chmod +x b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
137 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
138 committing files:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
139 b
42286
8988e640a8ac commit: fix a typo ("form p1" -> "from p1")
Martin von Zweigbergk <martinvonz@google.com>
parents: 39111
diff changeset
140 reusing manifest from p1 (listed files actually unchanged)
39110
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
141 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
142 updating the branch cache
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 39110
diff changeset
143 committed changeset 3:c8d50407916ef8a5a97cb6e36ca9bc844a6ee13e
39110
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
144 $ hg log -GTl
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 39110
diff changeset
145 @ 3:c8d50407916e p=2,1 m=2:36b69ba4b24b f=[]
39110
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
146 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
147 | o 2:99451f16b3f5 p=0,-1 m=2:36b69ba4b24b f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
148 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
149 o | 1:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
150 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
151 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
152
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
153 $ hg files -vr3
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
154 0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
155 0 x b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
156
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
157 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
158 $ check_convert_identity flag-change-take-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
159
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
160 An identical file added at both parents, but the flag differs. Take other:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
161
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
162 $ hg init flag-change-take-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
163 $ cd flag-change-take-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
164 $ touch a b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
165 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
166 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
167 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
168 $ touch b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
169 $ chmod +x b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
170 $ hg ci -qAm2 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
171
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
172 $ hg merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
173 warning: cannot merge flags for b without common ancestor - keeping local flags
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
174 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
175 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
176 $ chmod -x b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
177 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
178 committing files:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
179 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
180 committing manifest
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
181 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
182 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
183 committed changeset 3:06a62a687d87c7d8944743dee1ee9d8c66b3f6e3
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
184 $ hg log -GTl
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
185 @ 3:06a62a687d87 p=2,1 m=3:2a315ba1aa45 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
186 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
187 | o 2:99451f16b3f5 p=0,-1 m=2:36b69ba4b24b f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
188 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
189 o | 1:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
190 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
191 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
192
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
193 $ hg files -vr3
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
194 0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
195 0 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
196
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
197 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
198 $ check_convert_identity flag-change-take-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
199
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
200 #endif
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
201
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
202 An identical file added at both parents, one more file added at p2:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
203
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
204 $ hg init added-some-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
205 $ cd added-some-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
206 $ touch a b c
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
207 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
208 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
209 $ hg ci -qAm2 c
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
210 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
211 $ touch b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
212 $ hg ci -qAm3 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
213
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
214 $ hg merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
215 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
216 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
217 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
218 committing files:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
219 c
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 39110
diff changeset
220 not reusing manifest (no file change in changelog, but manifest differs)
39110
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
221 committing manifest
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
222 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
223 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
224 committed changeset 4:f7fbc4e4d9a8fde03ba475adad675578c8bf472d
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
225 $ hg log -GTl
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
226 @ 4:f7fbc4e4d9a8 p=3,2 m=3:92acd5bfd716 f=[]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
227 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
228 | o 3:e9d9f3cc981f p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
229 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
230 o | 2:93c5529a4ec7 p=1,-1 m=2:ae25a31b30b3 f=["c"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
231 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
232 o | 1:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
233 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
234 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
235
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
236
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
237 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
238 $ check_convert_identity added-some-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
239
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
240 An identical file added at both parents, one more file added at p1:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
241 (In this case, p1 manifest is reused at the merge commit, which means the
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
242 manifest DAG does not have the same shape as the changelog.)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
243
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
244 $ hg init added-some-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
245 $ cd added-some-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
246 $ touch a b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
247 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
248 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
249 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
250 $ touch b c
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
251 $ hg ci -qAm2 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
252 $ hg ci -qAm3 c
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
253
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
254 $ hg merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
255 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
256 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
257 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
258 reusing manifest from p1 (no file change)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
259 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
260 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
261 committed changeset 4:a9f0f589a913f5a149dc10dfbd5af726977c36c4
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
262 $ hg log -GTl
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
263 @ 4:a9f0f589a913 p=3,1 m=2:ae25a31b30b3 f=[]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
264 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
265 | o 3:b8dc385241b5 p=2,-1 m=2:ae25a31b30b3 f=["c"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
266 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
267 | o 2:f00991f11eca p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
268 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
269 o | 1:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
270 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
271 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"]
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
272
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
273
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
274 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
275 $ check_convert_identity added-some-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
276
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
277 A file added at p2, a named branch created at p1:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
278
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
279 $ hg init named-branch-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
280 $ cd named-branch-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
281 $ touch a b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
282 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
283 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
284 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
285 $ hg branch -q foo
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
286 $ hg ci -m2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
287
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
288 $ hg merge default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
289 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
290 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
291 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
292 committing files:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
293 b
39111
46da52f4b820 commit: try hard to reuse p1 manifest if nothing changed
Yuya Nishihara <yuya@tcha.org>
parents: 39110
diff changeset
294 not reusing manifest (no file change in changelog, but manifest differs)
39110
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
295 committing manifest
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
296 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
297 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
298 committed changeset 3:fb97d83b02fd072295cfc2171f21b7d38509bfd7
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
299 $ hg log -GT'{l} branch={branch}'
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
300 @ 3:fb97d83b02fd p=2,1 m=2:9091c64f4ea1 f=[] branch=foo
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
301 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
302 | o 2:a3a9fa6587e5 p=0,-1 m=0:8515d4bfda76 f=[] branch=foo
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
303 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
304 o | 1:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
305 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
306 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
307
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
308
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
309 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
310 $ check_convert_identity named-branch-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
311
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
312 A file added at p1, a named branch created at p2:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
313 (In this case, p1 manifest is reused at the merge commit, which means the
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
314 manifest DAG does not have the same shape as the changelog.)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
315
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
316 $ hg init named-branch-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
317 $ cd named-branch-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
318 $ touch a b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
319 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
320 $ hg branch -q foo
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
321 $ hg ci -m1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
322 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
323 $ hg ci -qAm1 b
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
324
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
325 $ hg merge foo
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
326 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
327 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
328 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
329 reusing manifest from p1 (no file change)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
330 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
331 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
332 committed changeset 3:036823e24692218324d4af43b07ff89f8a000096
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
333 $ hg log -GT'{l} branch={branch}'
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
334 @ 3:036823e24692 p=2,1 m=1:686dbf0aeca4 f=[] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
335 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
336 | o 2:64d01526d4c2 p=0,-1 m=1:686dbf0aeca4 f=["b"] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
337 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
338 o | 1:da38c8e00727 p=0,-1 m=0:8515d4bfda76 f=[] branch=foo
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
339 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
340 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
341
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
342
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
343 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
344 $ check_convert_identity named-branch-p2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
345
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
346 A file changed once at both parents, but amended to have identical content:
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
347
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
348 $ hg init amend-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
349 $ cd amend-p1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
350 $ touch a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
351 $ hg ci -qAm0 a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
352 $ echo foo > a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
353 $ hg ci -m1
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
354 $ hg up -q 0
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
355 $ echo bar > a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
356 $ hg ci -qm2
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
357 $ echo foo > a
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
358 $ hg ci -qm3 --amend
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
359
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
360 $ hg merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
361 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
362 (branch merge, don't forget to commit)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
363 $ hg ci --debug -m merge
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
364 reusing manifest from p1 (no file change)
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
365 committing changelog
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
366 updating the branch cache
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
367 committed changeset 3:314e5bc5adf5c58ea571efabe33eedba20a201aa
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
368 $ hg log -GT'{l} branch={branch}'
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
369 @ 3:314e5bc5adf5 p=2,1 m=1:d33ea248bd73 f=[] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
370 |\
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
371 | o 2:de9c64f226a3 p=0,-1 m=1:d33ea248bd73 f=["a"] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
372 | |
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
373 o | 1:6a74aec01b3c p=0,-1 m=1:d33ea248bd73 f=["a"] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
374 |/
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
375 o 0:487a0a245cea p=-1,-1 m=0:8515d4bfda76 f=["a"] branch=default
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
376
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
377
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
378 $ cd ..
f0c2653ca706 merge: add tests for commit with no content change
Yuya Nishihara <yuya@tcha.org>
parents:
diff changeset
379 $ check_convert_identity amend-p1