From: "SZEDER Gábor" <szeder.dev@gmail.com>
To: Elijah Newren <newren@gmail.com>
Cc: "SZEDER Gábor" <szeder.dev@gmail.com>,
git@vger.kernel.org, sbeller@google.com, gitster@pobox.com,
torvalds@linux-foundation.org
Subject: Re: [PATCH v10 32/36] t6046: testcases checking whether updates can be skipped in a merge
Date: Thu, 19 Apr 2018 22:26:41 +0200 [thread overview]
Message-ID: <20180419202641.13593-1-szeder.dev@gmail.com> (raw)
In-Reply-To: <20180419175823.7946-33-newren@gmail.com>
Just a couple of minor things:
> +###########################################################################
> +# SECTION 1: Cases involving no renames (one side has subset of changes of
> +# the other side)
> +###########################################################################
> +
> +# Testcase 1a, Changes on A, subset of changes on B
> +# Commit O: b_1
> +# Commit A: b_2
> +# Commit B: b_3
> +# Expected: b_2
> +
> +test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' '
> + test_create_repo 1a &&
> + (
> + cd 1a &&
> +
> + test_write_lines 1 2 3 4 5 6 7 8 9 10 >b
Broken && chain.
<...>
> +###########################################################################
> +# SECTION 2: Cases involving basic renames
> +###########################################################################
> +
> +# Testcase 2a, Changes on A, rename on B
> +# Commit O: b_1
> +# Commit A: b_2
> +# Commit B: c_1
> +# Expected: c_2
> +
> +test_expect_success '2a-setup: Modify(A)/rename(B)' '
> + test_create_repo 2a &&
> + (
> + cd 2a &&
> +
> + test_seq 1 10 >b
Broken && chain.
> + git add b &&
> + test_tick &&
> + git commit -m "O" &&
> +
> + git branch O &&
> + git branch A &&
> + git branch B &&
> +
> + git checkout A &&
> + test_seq 1 11 > b &&
Nit: space between redirection operator and filename.
<...>
> +# Testcase 2b, Changed and renamed on A, subset of changes on B
> +# Commit O: b_1
> +# Commit A: c_2
> +# Commit B: b_3
> +# Expected: c_2
> +
> +test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' '
> + test_create_repo 2b &&
> + (
> + cd 2b &&
> +
> + test_write_lines 1 2 3 4 5 6 7 8 9 10 >b
Broken && chain.
<...>
> +# Testcase 2c, Changes on A, rename on B
> +# Commit O: b_1
> +# Commit A: b_2, c_3
> +# Commit B: c_1
> +# Expected: rename/add conflict c_2 vs c_3
> +#
> +# NOTE: Since A modified b_1->b_2, and B renamed b_1->c_1, the threeway
> +# merge of those files should result in c_2. We then should have a
> +# rename/add conflict between c_2 and c_3. However, if we note in
> +# merge_content() that A had the right contents (b_2 has same
> +# contents as c_2, just at a different name), and that A had the
> +# right path present (c_3 existed) and thus decides that it can
> +# skip the update, then we're in trouble. This test verifies we do
> +# not make that particular mistake.
> +
> +test_expect_success '2c-setup: Modify b & add c VS rename b->c' '
> + test_create_repo 2c &&
> + (
> + cd 2c &&
> +
> + test_seq 1 10 >b
Broken && chain.
<...>
> +###########################################################################
> +# SECTION 3: Cases involving directory renames
> +#
> +# NOTE:
> +# Directory renames only apply when one side renames a directory, and the
> +# other side adds or renames a path into that directory. Applying the
> +# directory rename to that new path creates a new pathname that didn't
> +# exist on either side of history. Thus, it is impossible for the
> +# merge contents to already be at the right path, so all of these checks
> +# exist just to make sure that updates are not skipped.
> +###########################################################################
> +
> +# Testcase 3a, Change + rename into dir foo on A, dir rename foo->bar on B
> +# Commit O: bq_1, foo/whatever
> +# Commit A: foo/{bq_2, whatever}
> +# Commit B: bq_1, bar/whatever
> +# Expected: bar/{bq_2, whatever}
> +
> +test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
> + test_create_repo 3a &&
> + (
> + cd 3a &&
> +
> + mkdir foo &&
> + test_seq 1 10 >bq &&
> + test_write_lines a b c d e f g h i j k >foo/whatever &&
> + git add bq foo/whatever &&
> + test_tick &&
> + git commit -m "O" &&
> +
> + git branch O &&
> + git branch A &&
> + git branch B &&
> +
> + git checkout A &&
> + test_seq 1 11 > bq &&
Space between redirection operator and filename.
<...>
> +# Testcase 3b, rename into dir foo on A, dir rename foo->bar + change on B
> +# Commit O: bq_1, foo/whatever
> +# Commit A: foo/{bq_1, whatever}
> +# Commit B: bq_2, bar/whatever
> +# Expected: bar/{bq_2, whatever}
> +
> +test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
> + test_create_repo 3b &&
> + (
> + cd 3b &&
> +
> + mkdir foo &&
> + test_seq 1 10 >bq &&
> + test_write_lines a b c d e f g h i j k >foo/whatever &&
> + git add bq foo/whatever &&
> + test_tick &&
> + git commit -m "O" &&
> +
> + git branch O &&
> + git branch A &&
> + git branch B &&
> +
> + git checkout A &&
> + git mv bq foo/ &&
> + test_tick &&
> + git commit -m "A" &&
> +
> + git checkout B &&
> + test_seq 1 11 > bq &&
Space between redirection operator and filename.
<...>
> +###########################################################################
> +# SECTION 4: Cases involving dirty changes
> +###########################################################################
> +
> +# Testcase 4a, Changed on A, subset of changes on B, locally modified
> +# Commit O: b_1
> +# Commit A: b_2
> +# Commit B: b_3
> +# Working copy: b_4
> +# Expected: b_2 for merge, b_4 in working copy
> +
> +test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods present' '
> + test_create_repo 4a &&
> + (
> + cd 4a &&
> +
> + test_write_lines 1 2 3 4 5 6 7 8 9 10 >b
Broken && chain.
<...>
> +# Testcase 4b, Changed+renamed on A, subset of changes on B, locally modified
> +# Commit O: b_1
> +# Commit A: c_2
> +# Commit B: b_3
> +# Working copy: c_4
> +# Expected: c_2
> +
> +test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
> + test_create_repo 4b &&
> + (
> + cd 4b &&
> +
> + test_write_lines 1 2 3 4 5 6 7 8 9 10 >b
Broken && chain.
next prev parent reply other threads:[~2018-04-19 20:26 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-19 17:57 [PATCH v10 00/36] Add directory rename detection to git Elijah Newren
2018-04-19 17:57 ` [PATCH v10 01/36] directory rename detection: basic testcases Elijah Newren
2018-04-19 17:57 ` [PATCH v10 02/36] directory rename detection: directory splitting testcases Elijah Newren
2018-04-19 17:57 ` [PATCH v10 03/36] directory rename detection: testcases to avoid taking detection too far Elijah Newren
2018-04-19 17:57 ` [PATCH v10 04/36] directory rename detection: partially renamed directory testcase/discussion Elijah Newren
2018-04-19 17:57 ` [PATCH v10 05/36] directory rename detection: files/directories in the way of some renames Elijah Newren
2018-04-19 17:57 ` [PATCH v10 06/36] directory rename detection: testcases checking which side did the rename Elijah Newren
2018-04-19 17:57 ` [PATCH v10 07/36] directory rename detection: more involved edge/corner testcases Elijah Newren
2018-04-19 17:57 ` [PATCH v10 08/36] directory rename detection: testcases exploring possibly suboptimal merges Elijah Newren
2018-04-19 17:57 ` [PATCH v10 09/36] directory rename detection: miscellaneous testcases to complete coverage Elijah Newren
2018-04-19 17:57 ` [PATCH v10 10/36] directory rename detection: tests for handling overwriting untracked files Elijah Newren
2018-04-19 17:57 ` [PATCH v10 11/36] directory rename detection: tests for handling overwriting dirty files Elijah Newren
2018-04-19 17:57 ` [PATCH v10 12/36] merge-recursive: move the get_renames() function Elijah Newren
2018-04-19 17:58 ` [PATCH v10 13/36] merge-recursive: introduce new functions to handle rename logic Elijah Newren
2018-04-19 17:58 ` [PATCH v10 14/36] merge-recursive: fix leaks of allocated renames and diff_filepairs Elijah Newren
2018-04-19 17:58 ` [PATCH v10 15/36] merge-recursive: make !o->detect_rename codepath more obvious Elijah Newren
2018-04-19 17:58 ` [PATCH v10 16/36] merge-recursive: split out code for determining diff_filepairs Elijah Newren
2018-04-19 17:58 ` [PATCH v10 17/36] merge-recursive: make a helper function for cleanup for handle_renames Elijah Newren
2018-04-19 17:58 ` [PATCH v10 18/36] merge-recursive: add get_directory_renames() Elijah Newren
2018-05-06 23:41 ` SZEDER Gábor
2018-05-07 15:45 ` [PATCH] fixup! " Elijah Newren
2019-10-09 20:38 ` [PATCH v10 18/36] " Johannes Schindelin
2019-10-11 20:02 ` Elijah Newren
2019-10-12 19:23 ` Johannes Schindelin
2018-04-19 17:58 ` [PATCH v10 19/36] merge-recursive: check for directory level conflicts Elijah Newren
2018-04-19 17:58 ` [PATCH v10 20/36] merge-recursive: add computation of collisions due to dir rename & merging Elijah Newren
2018-04-19 17:58 ` [PATCH v10 21/36] merge-recursive: check for file level conflicts then get new name Elijah Newren
2018-04-19 17:58 ` [PATCH v10 22/36] merge-recursive: when comparing files, don't include trees Elijah Newren
2018-04-19 17:58 ` [PATCH v10 23/36] merge-recursive: apply necessary modifications for directory renames Elijah Newren
2018-04-19 17:58 ` [PATCH v10 24/36] merge-recursive: avoid clobbering untracked files with " Elijah Newren
2018-04-19 17:58 ` [PATCH v10 25/36] merge-recursive: fix overwriting dirty files involved in renames Elijah Newren
2018-04-19 20:48 ` Martin Ågren
2018-04-19 20:54 ` Martin Ågren
2018-04-19 21:06 ` Elijah Newren
2018-04-19 17:58 ` [PATCH v10 26/36] merge-recursive: fix remaining directory rename + dirty overwrite cases Elijah Newren
2018-04-19 17:58 ` [PATCH v10 27/36] directory rename detection: new testcases showcasing a pair of bugs Elijah Newren
2018-04-19 17:58 ` [PATCH v10 28/36] merge-recursive: avoid spurious rename/rename conflict from dir renames Elijah Newren
2018-04-19 17:58 ` [PATCH v10 29/36] merge-recursive: improve add_cacheinfo error handling Elijah Newren
2018-04-19 17:58 ` [PATCH v10 30/36] merge-recursive: move more is_dirty handling to merge_content Elijah Newren
2018-04-19 17:58 ` [PATCH v10 31/36] merge-recursive: avoid triggering add_cacheinfo error with dirty mod Elijah Newren
2018-04-19 17:58 ` [PATCH v10 32/36] t6046: testcases checking whether updates can be skipped in a merge Elijah Newren
2018-04-19 20:26 ` SZEDER Gábor [this message]
2018-04-19 20:55 ` Elijah Newren
2018-04-19 17:58 ` [PATCH v10 33/36] merge-recursive: fix was_tracked() to quit lying with some renamed paths Elijah Newren
2018-04-19 20:39 ` Martin Ågren
2018-04-19 20:54 ` Elijah Newren
2018-04-20 12:23 ` SZEDER Gábor
2018-04-20 15:23 ` Elijah Newren
2018-04-21 19:37 ` [RFC PATCH v10 32.5/36] unpack_trees: fix memory corruption with split_index when src != dst Elijah Newren
2018-04-21 20:13 ` Elijah Newren
2018-04-22 12:38 ` Duy Nguyen
2018-04-23 17:09 ` Elijah Newren
2018-04-23 17:37 ` Duy Nguyen
2018-04-23 18:05 ` Elijah Newren
2018-04-24 0:24 ` [PATCH v2] unpack_trees: fix breakage when o->src_index != o->dst_index Elijah Newren
2018-04-24 1:51 ` Junio C Hamano
2018-04-24 3:05 ` Junio C Hamano
2018-04-24 6:50 ` [PATCH v3] " Elijah Newren
2018-04-29 18:05 ` Duy Nguyen
2018-04-29 20:53 ` Johannes Schindelin
2018-04-30 14:42 ` Duy Nguyen
2018-04-30 14:45 ` Duy Nguyen
2018-04-30 16:19 ` Elijah Newren
2018-04-30 16:29 ` Duy Nguyen
2018-04-19 17:58 ` [PATCH v10 34/36] merge-recursive: fix remainder of was_dirty() to use original index Elijah Newren
2018-04-19 17:58 ` [PATCH v10 35/36] merge-recursive: make "Auto-merging" comment show for other merges Elijah Newren
2018-04-19 17:58 ` [PATCH v10 36/36] merge-recursive: fix check for skipability of working tree updates Elijah Newren
2018-04-19 18:35 ` [PATCH v10 00/36] Add directory rename detection to git Elijah Newren
2018-04-19 18:41 ` Stefan Beller
2018-04-19 19:54 ` Derrick Stolee
2018-04-19 20:22 ` Elijah Newren
2018-04-20 3:05 ` Junio C Hamano
2018-04-23 17:50 ` Elijah Newren
2018-04-24 20:20 ` [PATCH v10 1/2] fixup! merge-recursive: fix was_tracked() to quit lying with some renamed paths Elijah Newren
2018-04-24 20:21 ` [PATCH v10 2/2] fixup! t6046: testcases checking whether updates can be skipped in a merge Elijah Newren
2018-04-23 17:28 ` [PATCH v10 00/36] Add directory rename detection to git Elijah Newren
2018-04-23 23:46 ` Junio C Hamano
2018-04-24 0:15 ` Elijah Newren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180419202641.13593-1-szeder.dev@gmail.com \
--to=szeder.dev@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=sbeller@google.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).