Patchwork [5,of,5] merge: add more thorough tests for --force

login
register
mail settings
Submitter Martin von Zweigbergk
Date Dec. 1, 2014, 6:15 a.m.
Message ID <b15a7c8e03308f3bb37f.1417414500@martinvonz.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6930/
State Accepted
Headers show

Comments

Martin von Zweigbergk - Dec. 1, 2014, 6:15 a.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1417031121 28800
#      Wed Nov 26 11:45:21 2014 -0800
# Node ID b15a7c8e03308f3bb37f6c0af1e633dfcd1a5ce9
# Parent  a1994ec16b4b3e618645c04110d962515422e213
merge: add more thorough tests for --force

With generate-working-copy-states.py generalized to support
arbitrarily many changesets, we can use it for generating test cases
for merge: use one changeset each for base, remote and local. With the
various working copy states, this is a total of 104 cases.

The first candidate for additional testing is 'hg merge --force'. Even
though the force option is deprecated, it is convenient for testing
because it can be tested without first needing to revert any
changes. Except for the lack of checking for uncommitted changes, it
differs in only a few cases from unforced merge.

The new tests cover all the cases in the existing test-merge-force.t,
except for the unforced merge case, which is covered in several other
files anyway, so nothing remains of the file after this patch.
Martin von Zweigbergk - Dec. 1, 2014, 6:30 a.m.
On Sun Nov 30 2014 at 10:21:54 PM Martin von Zweigbergk <
martinvonz@google.com> wrote:
>
> +Some files get added (e.g. content1_content2_content1_content1-untracked)
> +
> +It is not intuitive that content1_content2_content1_content4-tracked gets
> +merged while content1_content2_content1_content4-untracked gets
> overwritten.
> +Any *_content2_*-untracked triggers the modified/deleted prompt and then
> gets
> +overwritten.
> +
> +A lot of untracked files become tracked, for example
> +content1_content2_content2_content2-untracked.
> +
> +*_missing_missing_missing-tracked is reported as removed ('R'), which
> +doesn't make sense since the file did not exist in the parent, but on the
> +other hand, merged-in additions are reported as modifications, which is
> +almost as strange.
> +
> +missing_missing_content3_missing-tracked becomes removed ('R'), even
> though
> +the remote side did not touch the file
>

The above is just my brain dump while looking through the output; please
view especially this part of the patch as RFC.
Martin von Zweigbergk - Dec. 2, 2014, 6:57 a.m.
On Sun Nov 30 2014 at 10:21:54 PM Martin von Zweigbergk <
martinvonz@google.com> wrote:

> +# Notes:
> +# - local didn't really change content1_missing_*_content1-tracked, so
> +#   remote could potentially be chosen
>

Mads has now addressed this issue. I have rebased locally. Let me know when
you want me to post the rebased version.
Pierre-Yves David - Dec. 2, 2014, 10:05 p.m.
On 12/01/2014 10:57 PM, Martin von Zweigbergk wrote:
>
>
> On Sun Nov 30 2014 at 10:21:54 PM Martin von Zweigbergk
> <martinvonz@google.com <mailto:martinvonz@google.com>> wrote:
>
>     +# Notes:
>     +# - local didn't really change
>     content1_missing_*_content1-__tracked, so
>     +#   remote could potentially be chosen
>
>
> Mads has now addressed this issue. I have rebased locally. Let me know
> when you want me to post the rebased version.

Do you have a public repo to pull this rebased version from ?
Pierre-Yves David - Dec. 2, 2014, 10:39 p.m.
On 12/02/2014 02:05 PM, Pierre-Yves David wrote:
>
>
> On 12/01/2014 10:57 PM, Martin von Zweigbergk wrote:
>>
>>
>> On Sun Nov 30 2014 at 10:21:54 PM Martin von Zweigbergk
>> <martinvonz@google.com <mailto:martinvonz@google.com>> wrote:
>>
>>     +# Notes:
>>     +# - local didn't really change
>>     content1_missing_*_content1-__tracked, so
>>     +#   remote could potentially be chosen
>>
>>
>> Mads has now addressed this issue. I have rebased locally. Let me know
>> when you want me to post the rebased version.
>
> Do you have a public repo to pull this rebased version from ?

He has, and I'll pull and push this as soon as he is done satisfying the 
documentation deities.
Martin von Zweigbergk - Dec. 2, 2014, 10:47 p.m.
It should now be available on https://bitbucket.org/martinvonz/hg as
bookmark 'merge-tests', although bitbucket seems confused about the
existence of the branch/bookmark.

On Tue Dec 02 2014 at 2:40:32 PM Pierre-Yves David <
pierre-yves.david@ens-lyon.org> wrote:

>
>
> On 12/02/2014 02:05 PM, Pierre-Yves David wrote:
> >
> >
> > On 12/01/2014 10:57 PM, Martin von Zweigbergk wrote:
> >>
> >>
> >> On Sun Nov 30 2014 at 10:21:54 PM Martin von Zweigbergk
> >> <martinvonz@google.com <mailto:martinvonz@google.com>> wrote:
> >>
> >>     +# Notes:
> >>     +# - local didn't really change
> >>     content1_missing_*_content1-__tracked, so
> >>     +#   remote could potentially be chosen
> >>
> >>
> >> Mads has now addressed this issue. I have rebased locally. Let me know
> >> when you want me to post the rebased version.
> >
> > Do you have a public repo to pull this rebased version from ?
>
> He has, and I'll pull and push this as soon as he is done satisfying the
> documentation deities.
>
> --
> Pierre-Yves David
>
Pierre-Yves David - Dec. 2, 2014, 10:52 p.m.
On 12/02/2014 02:47 PM, Martin von Zweigbergk wrote:
> It should now be available on https://bitbucket.org/martinvonz/hg as
> bookmark 'merge-tests', although bitbucket seems confused about the
> existence of the branch/bookmark.

pull, tested and pushed to the clowncoper. Thanks

Patch

diff --git a/tests/test-merge-force.t b/tests/test-merge-force.t
--- a/tests/test-merge-force.t
+++ b/tests/test-merge-force.t
@@ -1,45 +1,681 @@ 
+Set up a base, local, and remote changeset, as well as the working copy state.
+Files names are of the form base_remote_local_working-copy. For example,
+content1_content2_content1_content2-untracked represents a
+file that was modified in the remote changeset, left untouched in the
+local changeset, and then modified in the working copy to match the
+remote content, then finally forgotten.
+
   $ hg init
 
-  $ echo a > a
-  $ hg ci -qAm 'add a'
+Create base changeset
 
-  $ echo b > b
-  $ hg ci -qAm 'add b'
+  $ python $TESTDIR/generate-working-copy-states.py state 3 1
+  $ hg addremove -q --similarity 0
+  $ hg commit -qm 'base'
 
-  $ hg up -qC 0
-  $ hg rm a
-  $ hg ci -m 'rm a'
-  created new head
+Create remote changeset
 
-  $ hg up -qC 1
-  $ rm a
+  $ python $TESTDIR/generate-working-copy-states.py state 3 2
+  $ hg addremove -q --similarity 0
+  $ hg commit -qm 'remote'
 
-Local deleted a file, remote removed
+Create local changeset
 
-Should fail, since there are deleted files:
+  $ hg update -q 0
+  $ python $TESTDIR/generate-working-copy-states.py state 3 3
+  $ hg addremove -q --similarity 0
+  $ hg commit -qm 'local'
 
-  $ hg merge
-  abort: uncommitted changes
-  (use 'hg status' to list changes)
-  [255]
+Set up working directory
 
-Should succeed with --force:
+  $ python $TESTDIR/generate-working-copy-states.py state 3 wc
+  $ hg addremove -q --similarity 0
+  $ hg forget *_*_*_*-untracked
+  $ rm *_*_*_missing-*
 
-  $ hg -v merge --force
-  resolving manifests
-  removing a
-  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  (branch merge, don't forget to commit)
+  $ hg status -A
+  M content1_content1_content1_content4-tracked
+  M content1_content1_content3_content1-tracked
+  M content1_content1_content3_content4-tracked
+  M content1_content2_content1_content2-tracked
+  M content1_content2_content1_content4-tracked
+  M content1_content2_content2_content1-tracked
+  M content1_content2_content2_content4-tracked
+  M content1_content2_content3_content1-tracked
+  M content1_content2_content3_content2-tracked
+  M content1_content2_content3_content4-tracked
+  M content1_missing_content1_content4-tracked
+  M content1_missing_content3_content1-tracked
+  M content1_missing_content3_content4-tracked
+  M missing_content2_content2_content4-tracked
+  M missing_content2_content3_content2-tracked
+  M missing_content2_content3_content4-tracked
+  M missing_missing_content3_content4-tracked
+  A content1_content1_missing_content1-tracked
+  A content1_content1_missing_content4-tracked
+  A content1_content2_missing_content1-tracked
+  A content1_content2_missing_content2-tracked
+  A content1_content2_missing_content4-tracked
+  A content1_missing_missing_content1-tracked
+  A content1_missing_missing_content4-tracked
+  A missing_content2_missing_content2-tracked
+  A missing_content2_missing_content4-tracked
+  A missing_missing_missing_content4-tracked
+  R content1_content1_content1_content1-untracked
+  R content1_content1_content1_content4-untracked
+  R content1_content1_content1_missing-untracked
+  R content1_content1_content3_content1-untracked
+  R content1_content1_content3_content3-untracked
+  R content1_content1_content3_content4-untracked
+  R content1_content1_content3_missing-untracked
+  R content1_content2_content1_content1-untracked
+  R content1_content2_content1_content2-untracked
+  R content1_content2_content1_content4-untracked
+  R content1_content2_content1_missing-untracked
+  R content1_content2_content2_content1-untracked
+  R content1_content2_content2_content2-untracked
+  R content1_content2_content2_content4-untracked
+  R content1_content2_content2_missing-untracked
+  R content1_content2_content3_content1-untracked
+  R content1_content2_content3_content2-untracked
+  R content1_content2_content3_content3-untracked
+  R content1_content2_content3_content4-untracked
+  R content1_content2_content3_missing-untracked
+  R content1_missing_content1_content1-untracked
+  R content1_missing_content1_content4-untracked
+  R content1_missing_content1_missing-untracked
+  R content1_missing_content3_content1-untracked
+  R content1_missing_content3_content3-untracked
+  R content1_missing_content3_content4-untracked
+  R content1_missing_content3_missing-untracked
+  R missing_content2_content2_content2-untracked
+  R missing_content2_content2_content4-untracked
+  R missing_content2_content2_missing-untracked
+  R missing_content2_content3_content2-untracked
+  R missing_content2_content3_content3-untracked
+  R missing_content2_content3_content4-untracked
+  R missing_content2_content3_missing-untracked
+  R missing_missing_content3_content3-untracked
+  R missing_missing_content3_content4-untracked
+  R missing_missing_content3_missing-untracked
+  ! content1_content1_content1_missing-tracked
+  ! content1_content1_content3_missing-tracked
+  ! content1_content1_missing_missing-tracked
+  ! content1_content2_content1_missing-tracked
+  ! content1_content2_content2_missing-tracked
+  ! content1_content2_content3_missing-tracked
+  ! content1_content2_missing_missing-tracked
+  ! content1_missing_content1_missing-tracked
+  ! content1_missing_content3_missing-tracked
+  ! content1_missing_missing_missing-tracked
+  ! missing_content2_content2_missing-tracked
+  ! missing_content2_content3_missing-tracked
+  ! missing_content2_missing_missing-tracked
+  ! missing_missing_content3_missing-tracked
+  ! missing_missing_missing_missing-tracked
+  ? content1_content1_missing_content1-untracked
+  ? content1_content1_missing_content4-untracked
+  ? content1_content2_missing_content1-untracked
+  ? content1_content2_missing_content2-untracked
+  ? content1_content2_missing_content4-untracked
+  ? content1_missing_missing_content1-untracked
+  ? content1_missing_missing_content4-untracked
+  ? missing_content2_missing_content2-untracked
+  ? missing_content2_missing_content4-untracked
+  ? missing_missing_missing_content4-untracked
+  C content1_content1_content1_content1-tracked
+  C content1_content1_content3_content3-tracked
+  C content1_content2_content1_content1-tracked
+  C content1_content2_content2_content2-tracked
+  C content1_content2_content3_content3-tracked
+  C content1_missing_content1_content1-tracked
+  C content1_missing_content3_content3-tracked
+  C missing_content2_content2_content2-tracked
+  C missing_content2_content3_content3-tracked
+  C missing_missing_content3_content3-tracked
 
-Should show 'a' as removed:
+Merge with remote
 
-  $ hg status
-  R a
+# Notes:
+# - local didn't really change content1_missing_*_content1-tracked, so
+#   remote could potentially be chosen
+# - local and remote changed content1_content2_*_content2-untracked
+#   in the same way, so it could potentially be left alone
 
-  $ hg ci -m merge
+  $ hg merge -f --tool internal:merge3 'desc("remote")'
+  local changed content1_missing_content1_content4-tracked which remote deleted
+  use (c)hanged version or (d)elete? c
+  local changed content1_missing_content3_content1-tracked which remote deleted
+  use (c)hanged version or (d)elete? c
+  local changed content1_missing_content3_content3-tracked which remote deleted
+  use (c)hanged version or (d)elete? c
+  local changed content1_missing_content3_content4-tracked which remote deleted
+  use (c)hanged version or (d)elete? c
+  local changed content1_missing_missing_content1-tracked which remote deleted
+  use (c)hanged version or (d)elete? c
+  local changed content1_missing_missing_content4-tracked which remote deleted
+  use (c)hanged version or (d)elete? c
+  remote changed content1_content2_content1_content1-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content1_content2-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content1_content4-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content1_missing-tracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content1_missing-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content2_content1-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content2_content2-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content2_content4-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content2_missing-tracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content2_missing-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content3_content1-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content3_content2-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content3_content3-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content3_content4-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content3_missing-tracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_content3_missing-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_missing_content1-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_missing_content2-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_missing_content4-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_missing_missing-tracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  remote changed content1_content2_missing_missing-untracked which local deleted
+  use (c)hanged version or leave (d)eleted? c
+  merging content1_content2_content1_content4-tracked
+  warning: conflicts during merge.
+  merging content1_content2_content1_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging content1_content2_content2_content1-tracked
+  merging content1_content2_content2_content4-tracked
+  warning: conflicts during merge.
+  merging content1_content2_content2_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging content1_content2_content3_content1-tracked
+  merging content1_content2_content3_content3-tracked
+  warning: conflicts during merge.
+  merging content1_content2_content3_content3-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging content1_content2_content3_content4-tracked
+  warning: conflicts during merge.
+  merging content1_content2_content3_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging content1_content2_missing_content1-tracked
+  merging content1_content2_missing_content4-tracked
+  warning: conflicts during merge.
+  merging content1_content2_missing_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging missing_content2_content2_content4-tracked
+  warning: conflicts during merge.
+  merging missing_content2_content2_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging missing_content2_content3_content3-tracked
+  warning: conflicts during merge.
+  merging missing_content2_content3_content3-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging missing_content2_content3_content4-tracked
+  warning: conflicts during merge.
+  merging missing_content2_content3_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging missing_content2_missing_content4-tracked
+  warning: conflicts during merge.
+  merging missing_content2_missing_content4-tracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  merging missing_content2_missing_content4-untracked
+  warning: conflicts during merge.
+  merging missing_content2_missing_content4-untracked incomplete! (edit conflicts, then use 'hg resolve --mark')
+  39 files updated, 3 files merged, 6 files removed, 10 files unresolved
+  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
+  [1]
 
-Should not show 'a':
+Check which files need to be resolved (should correspond to the ouput above).
+This should be the files for which the base (1st filename segment), the remote
+(2nd segment) and the working copy (4th segment) are all different.
 
-  $ hg manifest
-  b
+Interestingly, one untracked file got merged and added, which corresponds the
+odd 'if force and branchmerge and different' case in manifestmerge().
 
+  $ hg resolve -l
+  U content1_content2_content1_content4-tracked
+  R content1_content2_content2_content1-tracked
+  U content1_content2_content2_content4-tracked
+  R content1_content2_content3_content1-tracked
+  U content1_content2_content3_content3-tracked
+  U content1_content2_content3_content4-tracked
+  R content1_content2_missing_content1-tracked
+  U content1_content2_missing_content4-tracked
+  U missing_content2_content2_content4-tracked
+  U missing_content2_content3_content3-tracked
+  U missing_content2_content3_content4-tracked
+  U missing_content2_missing_content4-tracked
+  U missing_content2_missing_content4-untracked
+
+Check status and file content
+
+Some files get added (e.g. content1_content2_content1_content1-untracked)
+
+It is not intuitive that content1_content2_content1_content4-tracked gets
+merged while content1_content2_content1_content4-untracked gets overwritten.
+Any *_content2_*-untracked triggers the modified/deleted prompt and then gets
+overwritten.
+
+A lot of untracked files become tracked, for example
+content1_content2_content2_content2-untracked.
+
+*_missing_missing_missing-tracked is reported as removed ('R'), which
+doesn't make sense since the file did not exist in the parent, but on the
+other hand, merged-in additions are reported as modifications, which is
+almost as strange.
+
+missing_missing_content3_missing-tracked becomes removed ('R'), even though
+the remote side did not touch the file
+
+  $ for f in `python $TESTDIR/generate-working-copy-states.py filelist 3`
+  > do
+  >   echo
+  >   hg status -A $f
+  >   if test -f $f
+  >   then
+  >     cat $f
+  >   else
+  >     echo '<missing>'
+  >   fi
+  >   if test -f ${f}.orig
+  >   then
+  >     echo ${f}.orig:
+  >     cat ${f}.orig
+  >   fi
+  > done
+  
+  C content1_content1_content1_content1-tracked
+  content1
+  
+  R content1_content1_content1_content1-untracked
+  content1
+  
+  M content1_content1_content1_content4-tracked
+  content4
+  
+  R content1_content1_content1_content4-untracked
+  content4
+  
+  ! content1_content1_content1_missing-tracked
+  <missing>
+  
+  R content1_content1_content1_missing-untracked
+  <missing>
+  
+  M content1_content1_content3_content1-tracked
+  content1
+  
+  R content1_content1_content3_content1-untracked
+  content1
+  
+  C content1_content1_content3_content3-tracked
+  content3
+  
+  R content1_content1_content3_content3-untracked
+  content3
+  
+  M content1_content1_content3_content4-tracked
+  content4
+  
+  R content1_content1_content3_content4-untracked
+  content4
+  
+  ! content1_content1_content3_missing-tracked
+  <missing>
+  
+  R content1_content1_content3_missing-untracked
+  <missing>
+  
+  A content1_content1_missing_content1-tracked
+  content1
+  
+  ? content1_content1_missing_content1-untracked
+  content1
+  
+  A content1_content1_missing_content4-tracked
+  content4
+  
+  ? content1_content1_missing_content4-untracked
+  content4
+  
+  ! content1_content1_missing_missing-tracked
+  <missing>
+  
+  content1_content1_missing_missing-untracked: * (glob)
+  <missing>
+  
+  M content1_content2_content1_content1-tracked
+  content2
+  
+  M content1_content2_content1_content1-untracked
+  content2
+  
+  M content1_content2_content1_content2-tracked
+  content2
+  
+  M content1_content2_content1_content2-untracked
+  content2
+  
+  M content1_content2_content1_content4-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content4
+  ||||||| base
+  content1
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  content1_content2_content1_content4-tracked.orig:
+  content4
+  
+  M content1_content2_content1_content4-untracked
+  content2
+  
+  M content1_content2_content1_missing-tracked
+  content2
+  
+  M content1_content2_content1_missing-untracked
+  content2
+  
+  M content1_content2_content2_content1-tracked
+  content2
+  
+  M content1_content2_content2_content1-untracked
+  content2
+  
+  C content1_content2_content2_content2-tracked
+  content2
+  
+  M content1_content2_content2_content2-untracked
+  content2
+  
+  M content1_content2_content2_content4-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content4
+  ||||||| base
+  content1
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  content1_content2_content2_content4-tracked.orig:
+  content4
+  
+  M content1_content2_content2_content4-untracked
+  content2
+  
+  M content1_content2_content2_missing-tracked
+  content2
+  
+  M content1_content2_content2_missing-untracked
+  content2
+  
+  M content1_content2_content3_content1-tracked
+  content2
+  
+  M content1_content2_content3_content1-untracked
+  content2
+  
+  M content1_content2_content3_content2-tracked
+  content2
+  
+  M content1_content2_content3_content2-untracked
+  content2
+  
+  M content1_content2_content3_content3-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content3
+  ||||||| base
+  content1
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  content1_content2_content3_content3-tracked.orig:
+  content3
+  
+  M content1_content2_content3_content3-untracked
+  content2
+  
+  M content1_content2_content3_content4-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content4
+  ||||||| base
+  content1
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  content1_content2_content3_content4-tracked.orig:
+  content4
+  
+  M content1_content2_content3_content4-untracked
+  content2
+  
+  M content1_content2_content3_missing-tracked
+  content2
+  
+  M content1_content2_content3_missing-untracked
+  content2
+  
+  M content1_content2_missing_content1-tracked
+  content2
+  
+  M content1_content2_missing_content1-untracked
+  content2
+  
+  M content1_content2_missing_content2-tracked
+  content2
+  
+  M content1_content2_missing_content2-untracked
+  content2
+  
+  M content1_content2_missing_content4-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content4
+  ||||||| base
+  content1
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  content1_content2_missing_content4-tracked.orig:
+  content4
+  
+  M content1_content2_missing_content4-untracked
+  content2
+  
+  M content1_content2_missing_missing-tracked
+  content2
+  
+  M content1_content2_missing_missing-untracked
+  content2
+  
+  R content1_missing_content1_content1-tracked
+  <missing>
+  
+  R content1_missing_content1_content1-untracked
+  content1
+  
+  M content1_missing_content1_content4-tracked
+  content4
+  
+  R content1_missing_content1_content4-untracked
+  content4
+  
+  R content1_missing_content1_missing-tracked
+  <missing>
+  
+  R content1_missing_content1_missing-untracked
+  <missing>
+  
+  M content1_missing_content3_content1-tracked
+  content1
+  
+  R content1_missing_content3_content1-untracked
+  content1
+  
+  C content1_missing_content3_content3-tracked
+  content3
+  
+  R content1_missing_content3_content3-untracked
+  content3
+  
+  M content1_missing_content3_content4-tracked
+  content4
+  
+  R content1_missing_content3_content4-untracked
+  content4
+  
+  R content1_missing_content3_missing-tracked
+  <missing>
+  
+  R content1_missing_content3_missing-untracked
+  <missing>
+  
+  A content1_missing_missing_content1-tracked
+  content1
+  
+  ? content1_missing_missing_content1-untracked
+  content1
+  
+  A content1_missing_missing_content4-tracked
+  content4
+  
+  ? content1_missing_missing_content4-untracked
+  content4
+  
+  R content1_missing_missing_missing-tracked
+  <missing>
+  
+  content1_missing_missing_missing-untracked: * (glob)
+  <missing>
+  
+  C missing_content2_content2_content2-tracked
+  content2
+  
+  M missing_content2_content2_content2-untracked
+  content2
+  
+  M missing_content2_content2_content4-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content4
+  ||||||| base
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  missing_content2_content2_content4-tracked.orig:
+  content4
+  
+  M missing_content2_content2_content4-untracked
+  content2
+  
+  M missing_content2_content2_missing-tracked
+  content2
+  
+  M missing_content2_content2_missing-untracked
+  content2
+  
+  M missing_content2_content3_content2-tracked
+  content2
+  
+  M missing_content2_content3_content2-untracked
+  content2
+  
+  M missing_content2_content3_content3-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content3
+  ||||||| base
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  missing_content2_content3_content3-tracked.orig:
+  content3
+  
+  M missing_content2_content3_content3-untracked
+  content2
+  
+  M missing_content2_content3_content4-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content4
+  ||||||| base
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  missing_content2_content3_content4-tracked.orig:
+  content4
+  
+  M missing_content2_content3_content4-untracked
+  content2
+  
+  M missing_content2_content3_missing-tracked
+  content2
+  
+  M missing_content2_content3_missing-untracked
+  content2
+  
+  M missing_content2_missing_content2-tracked
+  content2
+  
+  M missing_content2_missing_content2-untracked
+  content2
+  
+  M missing_content2_missing_content4-tracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content4
+  ||||||| base
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  missing_content2_missing_content4-tracked.orig:
+  content4
+  
+  M missing_content2_missing_content4-untracked
+  <<<<<<< local: 0447570f1af6 - test: local
+  content4
+  ||||||| base
+  =======
+  content2
+  >>>>>>> other: 85100b8c675b  - test: remote
+  missing_content2_missing_content4-untracked.orig:
+  content4
+  
+  M missing_content2_missing_missing-tracked
+  content2
+  
+  M missing_content2_missing_missing-untracked
+  content2
+  
+  C missing_missing_content3_content3-tracked
+  content3
+  
+  R missing_missing_content3_content3-untracked
+  content3
+  
+  M missing_missing_content3_content4-tracked
+  content4
+  
+  R missing_missing_content3_content4-untracked
+  content4
+  
+  R missing_missing_content3_missing-tracked
+  <missing>
+  
+  R missing_missing_content3_missing-untracked
+  <missing>
+  
+  A missing_missing_missing_content4-tracked
+  content4
+  
+  ? missing_missing_missing_content4-untracked
+  content4
+  
+  R missing_missing_missing_missing-tracked
+  <missing>
+  
+  missing_missing_missing_missing-untracked: * (glob)
+  <missing>