tests/test-merge-force.t
author Kyle Lippincott <spectral@google.com>
Thu, 20 Jun 2019 11:40:47 -0700
changeset 42565 4764e8436b2a
parent 39707 5abc47d4ca6b
child 48427 38941a28406a
permissions -rw-r--r--
filemerge: make last line of prompts <40 english chars (issue6158) I've chosen <40 as the target so that other languages that may have a 2x blowup in character count can still have a chance to fit into an 80 column screen. Previously, we would show a prompt like: ``` keep (l)ocal [dest], take (o)ther [source], or leave (u)nresolved for some/potentially/really/long/path? ``` On at least some systems, if readline was in use then the last line of the prompt would be wrapped strangely if it couldn't fit entirely on one line. This strange wrapping may be just a carriage return without a line feed, overwriting the beginning of the line; example (100 columns wide, 65 character filename, and yes there's 10 spaces on the end, I assume this is to handle the user inputting longest word we provide as an option, "unresolved"): ``` ng/dir/name/that/does/not/work/well/with/readline/file.txt? ave (u)nresolved for some/lon ``` In some cases it may partially wrap onto the next line, but still be missing earlier parts in the line, such as below (60 columns wide, 65 character filename): ``` rev], or leave (u)nresolved for some/long/dir/name/that/do s/not/work/well/with/readline/file.txt? ``` With this fix, this looks like this on a 60 column screen: ``` tool vim_with_markers (for pattern some/long/dir/name/that/d oes/not/work/well/with/readline/file.txt) can't handle binar y tool meld can't handle binary tool vim_with_markers can't handle binary tool internal:merge3 can't handle binary tool merge can't handle binary no tool found to merge some/long/dir/name/that/does/not/work /well/with/readline/file.txt file 'some/long/dir/name/that/does/not/work/well/with/readli ne/file.txt' needs to be resolved. You can keep (l)ocal [working copy], take (o)ther [merge rev ], or leave (u)nresolved. What do you want to do? ``` Differential Revision: https://phab.mercurial-scm.org/D6562
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
     1
Set up a base, local, and remote changeset, as well as the working copy state.
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
     2
Files names are of the form base_remote_local_working-copy. For example,
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
     3
content1_content2_content1_content2-untracked represents a
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
     4
file that was modified in the remote changeset, left untouched in the
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
     5
local changeset, and then modified in the working copy to match the
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
     6
remote content, then finally forgotten.
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
     7
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
     8
  $ hg init repo
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
     9
  $ cd repo
6255
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    10
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    11
Create base changeset
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    12
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39285
diff changeset
    13
  $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 1
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    14
  $ hg addremove -q --similarity 0
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    15
  $ hg commit -qm 'base'
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    16
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    17
Create remote changeset
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    18
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39285
diff changeset
    19
  $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 2
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    20
  $ hg addremove -q --similarity 0
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    21
  $ hg commit -qm 'remote'
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    22
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    23
Create local changeset
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    24
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    25
  $ hg update -q 0
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39285
diff changeset
    26
  $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 3
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    27
  $ hg addremove -q --similarity 0
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    28
  $ hg commit -qm 'local'
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    29
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    30
Set up working directory
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    31
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39285
diff changeset
    32
  $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 wc
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    33
  $ hg addremove -q --similarity 0
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    34
  $ hg forget *_*_*_*-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    35
  $ rm *_*_*_missing-*
12256
2a06cb547be8 tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com>
parents: 6256
diff changeset
    36
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    37
  $ hg status -A
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    38
  M content1_content1_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    39
  M content1_content1_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    40
  M content1_content1_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    41
  M content1_content2_content1_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    42
  M content1_content2_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    43
  M content1_content2_content2_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    44
  M content1_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    45
  M content1_content2_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    46
  M content1_content2_content3_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    47
  M content1_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    48
  M content1_missing_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    49
  M content1_missing_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    50
  M content1_missing_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    51
  M missing_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    52
  M missing_content2_content3_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    53
  M missing_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    54
  M missing_missing_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    55
  A content1_content1_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    56
  A content1_content1_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    57
  A content1_content2_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    58
  A content1_content2_missing_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    59
  A content1_content2_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    60
  A content1_missing_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    61
  A content1_missing_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    62
  A missing_content2_missing_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    63
  A missing_content2_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    64
  A missing_missing_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    65
  R content1_content1_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    66
  R content1_content1_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    67
  R content1_content1_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    68
  R content1_content1_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    69
  R content1_content1_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    70
  R content1_content1_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    71
  R content1_content1_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    72
  R content1_content2_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    73
  R content1_content2_content1_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    74
  R content1_content2_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    75
  R content1_content2_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    76
  R content1_content2_content2_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    77
  R content1_content2_content2_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    78
  R content1_content2_content2_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    79
  R content1_content2_content2_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    80
  R content1_content2_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    81
  R content1_content2_content3_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    82
  R content1_content2_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    83
  R content1_content2_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    84
  R content1_content2_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    85
  R content1_missing_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    86
  R content1_missing_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    87
  R content1_missing_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    88
  R content1_missing_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    89
  R content1_missing_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    90
  R content1_missing_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    91
  R content1_missing_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    92
  R missing_content2_content2_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    93
  R missing_content2_content2_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    94
  R missing_content2_content2_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    95
  R missing_content2_content3_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    96
  R missing_content2_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    97
  R missing_content2_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    98
  R missing_content2_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
    99
  R missing_missing_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   100
  R missing_missing_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   101
  R missing_missing_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   102
  ! content1_content1_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   103
  ! content1_content1_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   104
  ! content1_content1_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   105
  ! content1_content2_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   106
  ! content1_content2_content2_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   107
  ! content1_content2_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   108
  ! content1_content2_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   109
  ! content1_missing_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   110
  ! content1_missing_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   111
  ! content1_missing_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   112
  ! missing_content2_content2_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   113
  ! missing_content2_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   114
  ! missing_content2_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   115
  ! missing_missing_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   116
  ! missing_missing_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   117
  ? content1_content1_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   118
  ? content1_content1_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   119
  ? content1_content2_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   120
  ? content1_content2_missing_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   121
  ? content1_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   122
  ? content1_missing_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   123
  ? content1_missing_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   124
  ? missing_content2_missing_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   125
  ? missing_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   126
  ? missing_missing_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   127
  C content1_content1_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   128
  C content1_content1_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   129
  C content1_content2_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   130
  C content1_content2_content2_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   131
  C content1_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   132
  C content1_missing_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   133
  C content1_missing_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   134
  C missing_content2_content2_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   135
  C missing_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   136
  C missing_missing_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   137
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   138
Merge with remote
6255
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   139
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   140
# Notes:
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   141
# - local and remote changed content1_content2_*_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   142
#   in the same way, so it could potentially be left alone
6255
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   143
28021
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   144
  $ hg merge -f --tool internal:merge3 'desc("remote")' 2>&1 | tee $TESTTMP/merge-output-1
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   145
  file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   146
  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   147
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   148
  file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   149
  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   150
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   151
  file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   152
  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   153
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   154
  file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   155
  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   156
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   157
  file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   158
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   159
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   160
  file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   161
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   162
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   163
  file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   164
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   165
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   166
  file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   167
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   168
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   169
  file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   170
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   171
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   172
  file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   173
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   174
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   175
  file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   176
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   177
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   178
  file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   179
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   180
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   181
  file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   182
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   183
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   184
  file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   185
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   186
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   187
  file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   188
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   189
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   190
  file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   191
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   192
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   193
  file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   194
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   195
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   196
  file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   197
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   198
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   199
  file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   200
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   201
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   202
  file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   203
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   204
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   205
  file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   206
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   207
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   208
  file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   209
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   210
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   211
  file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   212
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   213
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   214
  file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   215
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   216
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   217
  file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   218
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   219
  What do you want to do? u
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   220
  merging content1_content2_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   221
  merging content1_content2_content2_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   222
  merging content1_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   223
  merging content1_content2_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   224
  merging content1_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   225
  merging content1_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   226
  merging content1_content2_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   227
  merging content1_content2_missing_content4-tracked
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   228
  merging missing_content2_content2_content4-tracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   229
  merging missing_content2_content3_content3-tracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   230
  merging missing_content2_content3_content4-tracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   231
  merging missing_content2_missing_content4-tracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   232
  merging missing_content2_missing_content4-untracked
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   233
  warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   234
  warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   235
  warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26614
diff changeset
   236
  warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
26614
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 23543
diff changeset
   237
  warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 23543
diff changeset
   238
  warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 23543
diff changeset
   239
  warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 23543
diff changeset
   240
  warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 23543
diff changeset
   241
  warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
ef1eb6df7071 simplemerge: move conflict warning message to filemerge
Siddharth Agarwal <sid0@fb.com>
parents: 23543
diff changeset
   242
  warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   243
  18 files updated, 3 files merged, 8 files removed, 35 files unresolved
35704
41ef02ba329b merge: add `--abort` flag which can abort the merge
Pulkit Goyal <7895pulkit@gmail.com>
parents: 32940
diff changeset
   244
  use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
12256
2a06cb547be8 tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com>
parents: 6256
diff changeset
   245
23543
4dd8a6a1240d spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 23449
diff changeset
   246
Check which files need to be resolved (should correspond to the output above).
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   247
This should be the files for which the base (1st filename segment), the remote
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   248
(2nd segment) and the working copy (4th segment) are all different.
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   249
23543
4dd8a6a1240d spelling: fixes from proofreading of spell checker issues
Mads Kiilerich <madski@unity3d.com>
parents: 23449
diff changeset
   250
Interestingly, one untracked file got merged and added, which corresponds to the
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   251
odd 'if force and branchmerge and different' case in manifestmerge().
12256
2a06cb547be8 tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com>
parents: 6256
diff changeset
   252
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   253
  $ hg resolve -l
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   254
  U content1_content2_content1_content1-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   255
  U content1_content2_content1_content2-untracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   256
  U content1_content2_content1_content4-tracked
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   257
  U content1_content2_content1_content4-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   258
  U content1_content2_content1_missing-tracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   259
  U content1_content2_content1_missing-untracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   260
  R content1_content2_content2_content1-tracked
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   261
  U content1_content2_content2_content1-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   262
  U content1_content2_content2_content2-untracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   263
  U content1_content2_content2_content4-tracked
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   264
  U content1_content2_content2_content4-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   265
  U content1_content2_content2_missing-tracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   266
  U content1_content2_content2_missing-untracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   267
  R content1_content2_content3_content1-tracked
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   268
  U content1_content2_content3_content1-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   269
  U content1_content2_content3_content2-untracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   270
  U content1_content2_content3_content3-tracked
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   271
  U content1_content2_content3_content3-untracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   272
  U content1_content2_content3_content4-tracked
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   273
  U content1_content2_content3_content4-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   274
  U content1_content2_content3_missing-tracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   275
  U content1_content2_content3_missing-untracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   276
  R content1_content2_missing_content1-tracked
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   277
  U content1_content2_missing_content1-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   278
  U content1_content2_missing_content2-untracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   279
  U content1_content2_missing_content4-tracked
27599
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   280
  U content1_content2_missing_content4-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   281
  U content1_content2_missing_missing-tracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   282
  U content1_content2_missing_missing-untracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   283
  U content1_missing_content1_content4-tracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   284
  U content1_missing_content3_content3-tracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   285
  U content1_missing_content3_content4-tracked
ad5966de3c9a filemerge: default change/delete conflicts to 'leave unresolved' (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 27557
diff changeset
   286
  U content1_missing_missing_content4-tracked
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   287
  U missing_content2_content2_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   288
  U missing_content2_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   289
  U missing_content2_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   290
  U missing_content2_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   291
  U missing_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   292
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   293
Check status and file content
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   294
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   295
Some files get added (e.g. content1_content2_content1_content1-untracked)
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   296
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   297
It is not intuitive that content1_content2_content1_content4-tracked gets
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   298
merged while content1_content2_content1_content4-untracked gets overwritten.
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   299
Any *_content2_*-untracked triggers the modified/deleted prompt and then gets
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   300
overwritten.
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   301
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   302
A lot of untracked files become tracked, for example
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   303
content1_content2_content2_content2-untracked.
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   304
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   305
*_missing_missing_missing-tracked is reported as removed ('R'), which
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   306
doesn't make sense since the file did not exist in the parent, but on the
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   307
other hand, merged-in additions are reported as modifications, which is
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   308
almost as strange.
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   309
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   310
missing_missing_content3_missing-tracked becomes removed ('R'), even though
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   311
the remote side did not touch the file
6255
ae83d927c629 add a test for a375ffc2aa1b
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
   312
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   313
  $ checkstatus() {
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39285
diff changeset
   314
  >   for f in `"$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 3`
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   315
  >   do
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   316
  >     echo
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   317
  >     hg status -A $f
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   318
  >     if test -f $f
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   319
  >     then
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   320
  >       cat $f
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   321
  >     else
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   322
  >       echo '<missing>'
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   323
  >     fi
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   324
  >   done
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   325
  > }
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   326
  $ checkstatus 2>&1 | tee $TESTTMP/status1
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   327
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   328
  C content1_content1_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   329
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   330
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   331
  R content1_content1_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   332
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   333
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   334
  M content1_content1_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   335
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   336
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   337
  R content1_content1_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   338
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   339
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   340
  ! content1_content1_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   341
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   342
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   343
  R content1_content1_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   344
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   345
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   346
  M content1_content1_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   347
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   348
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   349
  R content1_content1_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   350
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   351
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   352
  C content1_content1_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   353
  content3
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   354
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   355
  R content1_content1_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   356
  content3
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   357
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   358
  M content1_content1_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   359
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   360
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   361
  R content1_content1_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   362
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   363
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   364
  ! content1_content1_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   365
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   366
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   367
  R content1_content1_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   368
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   369
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   370
  A content1_content1_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   371
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   372
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   373
  ? content1_content1_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   374
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   375
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   376
  A content1_content1_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   377
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   378
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   379
  ? content1_content1_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   380
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   381
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   382
  ! content1_content1_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   383
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   384
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   385
  content1_content1_missing_missing-untracked: * (glob)
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   386
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   387
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   388
  M content1_content2_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   389
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   390
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   391
  M content1_content2_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   392
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   393
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   394
  M content1_content2_content1_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   395
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   396
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   397
  M content1_content2_content1_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   398
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   399
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   400
  M content1_content2_content1_content4-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   401
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   402
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   403
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   404
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   405
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   406
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   407
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   408
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   409
  M content1_content2_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   410
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   411
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   412
  M content1_content2_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   413
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   414
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   415
  M content1_content2_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   416
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   417
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   418
  M content1_content2_content2_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   419
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   420
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   421
  M content1_content2_content2_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   422
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   423
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   424
  C content1_content2_content2_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   425
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   426
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   427
  M content1_content2_content2_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   428
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   429
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   430
  M content1_content2_content2_content4-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   431
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   432
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   433
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   434
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   435
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   436
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   437
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   438
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   439
  M content1_content2_content2_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   440
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   441
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   442
  M content1_content2_content2_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   443
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   444
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   445
  M content1_content2_content2_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   446
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   447
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   448
  M content1_content2_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   449
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   450
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   451
  M content1_content2_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   452
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   453
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   454
  M content1_content2_content3_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   455
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   456
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   457
  M content1_content2_content3_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   458
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   459
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   460
  M content1_content2_content3_content3-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   461
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   462
  content3
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   463
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   464
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   465
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   466
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   467
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   468
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   469
  M content1_content2_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   470
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   471
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   472
  M content1_content2_content3_content4-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   473
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   474
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   475
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   476
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   477
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   478
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   479
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   480
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   481
  M content1_content2_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   482
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   483
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   484
  M content1_content2_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   485
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   486
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   487
  M content1_content2_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   488
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   489
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   490
  M content1_content2_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   491
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   492
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   493
  M content1_content2_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   494
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   495
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   496
  M content1_content2_missing_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   497
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   498
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   499
  M content1_content2_missing_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   500
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   501
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   502
  M content1_content2_missing_content4-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   503
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   504
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   505
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   506
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   507
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   508
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   509
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   510
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   511
  M content1_content2_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   512
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   513
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   514
  M content1_content2_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   515
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   516
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   517
  M content1_content2_missing_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   518
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   519
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   520
  R content1_missing_content1_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   521
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   522
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   523
  R content1_missing_content1_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   524
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   525
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   526
  M content1_missing_content1_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   527
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   528
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   529
  R content1_missing_content1_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   530
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   531
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   532
  R content1_missing_content1_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   533
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   534
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   535
  R content1_missing_content1_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   536
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   537
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   538
  R content1_missing_content3_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   539
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   540
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   541
  R content1_missing_content3_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   542
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   543
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   544
  C content1_missing_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   545
  content3
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   546
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   547
  R content1_missing_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   548
  content3
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   549
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   550
  M content1_missing_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   551
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   552
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   553
  R content1_missing_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   554
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   555
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   556
  R content1_missing_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   557
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   558
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   559
  R content1_missing_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   560
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   561
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   562
  R content1_missing_missing_content1-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   563
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   564
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   565
  ? content1_missing_missing_content1-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   566
  content1
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   567
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   568
  A content1_missing_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   569
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   570
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   571
  ? content1_missing_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   572
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   573
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   574
  R content1_missing_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   575
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   576
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   577
  content1_missing_missing_missing-untracked: * (glob)
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   578
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   579
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   580
  C missing_content2_content2_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   581
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   582
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   583
  M missing_content2_content2_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   584
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   585
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   586
  M missing_content2_content2_content4-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   587
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   588
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   589
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   590
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   591
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   592
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   593
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   594
  M missing_content2_content2_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   595
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   596
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   597
  M missing_content2_content2_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   598
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   599
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   600
  M missing_content2_content2_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   601
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   602
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   603
  M missing_content2_content3_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   604
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   605
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   606
  M missing_content2_content3_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   607
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   608
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   609
  M missing_content2_content3_content3-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   610
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   611
  content3
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   612
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   613
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   614
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   615
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   616
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   617
  M missing_content2_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   618
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   619
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   620
  M missing_content2_content3_content4-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   621
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   622
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   623
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   624
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   625
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   626
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   627
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   628
  M missing_content2_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   629
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   630
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   631
  M missing_content2_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   632
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   633
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   634
  M missing_content2_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   635
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   636
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   637
  M missing_content2_missing_content2-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   638
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   639
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   640
  M missing_content2_missing_content2-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   641
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   642
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   643
  M missing_content2_missing_content4-tracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   644
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   645
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   646
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   647
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   648
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   649
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   650
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   651
  M missing_content2_missing_content4-untracked
30062
940c05b25b07 merge: add conflict labels to merge command
Simon Farnsworth <simonfar@fb.com>
parents: 29775
diff changeset
   652
  <<<<<<< working copy: 0447570f1af6 - test: local
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   653
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   654
  ||||||| base
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   655
  =======
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   656
  content2
30460
ce3a133f71b3 conflicts: make spacing consistent in conflict markers
Kostia Balytskyi <ikostia@fb.com>
parents: 30062
diff changeset
   657
  >>>>>>> merge rev:    85100b8c675b - test: remote
23449
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   658
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   659
  M missing_content2_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   660
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   661
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   662
  M missing_content2_missing_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   663
  content2
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   664
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   665
  C missing_missing_content3_content3-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   666
  content3
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   667
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   668
  R missing_missing_content3_content3-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   669
  content3
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   670
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   671
  M missing_missing_content3_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   672
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   673
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   674
  R missing_missing_content3_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   675
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   676
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   677
  R missing_missing_content3_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   678
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   679
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   680
  R missing_missing_content3_missing-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   681
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   682
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   683
  A missing_missing_missing_content4-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   684
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   685
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   686
  ? missing_missing_missing_content4-untracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   687
  content4
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   688
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   689
  R missing_missing_missing_missing-tracked
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   690
  <missing>
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   691
  
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   692
  missing_missing_missing_missing-untracked: * (glob)
eeecf29cc397 merge: add more thorough tests for --force
Martin von Zweigbergk <martinvonz@google.com>
parents: 19802
diff changeset
   693
  <missing>
27133
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   694
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39285
diff changeset
   695
  $ for f in `"$PYTHON" $TESTDIR/generate-working-copy-states.py filelist 3`
27133
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   696
  > do
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   697
  >   if test -f ${f}.orig
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   698
  >   then
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   699
  >     echo ${f}.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   700
  >     cat ${f}.orig
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   701
  >   fi
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   702
  > done
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   703
  content1_content2_content1_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   704
  content4
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   705
  content1_content2_content2_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   706
  content4
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   707
  content1_content2_content3_content3-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   708
  content3
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   709
  content1_content2_content3_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   710
  content4
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   711
  content1_content2_missing_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   712
  content4
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   713
  missing_content2_content2_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   714
  content4
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   715
  missing_content2_content3_content3-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   716
  content3
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   717
  missing_content2_content3_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   718
  content4
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   719
  missing_content2_missing_content4-tracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   720
  content4
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   721
  missing_content2_missing_content4-untracked.orig:
8dff49c34a67 test-merge-force.t: check .orig files separately
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   722
  content4
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   723
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   724
Re-resolve and check status
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   725
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   726
  $ hg resolve --unmark --all
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   727
  $ hg resolve --all --tool :local
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   728
  (no more unresolved files)
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   729
  $ hg resolve --unmark --all
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   730
  $ hg resolve --all --tool internal:merge3
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   731
  file 'content1_content2_content1_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   732
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   733
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   734
  file 'content1_content2_content1_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   735
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   736
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   737
  merging content1_content2_content1_content4-tracked
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   738
  file 'content1_content2_content1_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   739
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   740
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   741
  file 'content1_content2_content1_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   742
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   743
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   744
  file 'content1_content2_content1_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   745
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   746
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   747
  merging content1_content2_content2_content1-tracked
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   748
  file 'content1_content2_content2_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   749
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   750
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   751
  file 'content1_content2_content2_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   752
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   753
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   754
  merging content1_content2_content2_content4-tracked
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   755
  file 'content1_content2_content2_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   756
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   757
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   758
  file 'content1_content2_content2_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   759
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   760
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   761
  file 'content1_content2_content2_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   762
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   763
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   764
  merging content1_content2_content3_content1-tracked
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   765
  file 'content1_content2_content3_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   766
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   767
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   768
  file 'content1_content2_content3_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   769
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   770
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   771
  merging content1_content2_content3_content3-tracked
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   772
  file 'content1_content2_content3_content3-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   773
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   774
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   775
  merging content1_content2_content3_content4-tracked
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   776
  file 'content1_content2_content3_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   777
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   778
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   779
  file 'content1_content2_content3_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   780
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   781
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   782
  file 'content1_content2_content3_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   783
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   784
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   785
  merging content1_content2_missing_content1-tracked
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   786
  file 'content1_content2_missing_content1-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   787
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   788
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   789
  file 'content1_content2_missing_content2-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   790
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   791
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   792
  merging content1_content2_missing_content4-tracked
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   793
  file 'content1_content2_missing_content4-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   794
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   795
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   796
  file 'content1_content2_missing_missing-tracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   797
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   798
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   799
  file 'content1_content2_missing_missing-untracked' was deleted in local [working copy] but was modified in other [merge rev].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   800
  You can use (c)hanged version, leave (d)eleted, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   801
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   802
  file 'content1_missing_content1_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   803
  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   804
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   805
  file 'content1_missing_content3_content3-tracked' was deleted in other [merge rev] but was modified in local [working copy].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   806
  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   807
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   808
  file 'content1_missing_content3_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   809
  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   810
  What do you want to do? u
39285
a3fd84f4fb38 filemerge: fix the wrong placements of messages in prompt
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 39284
diff changeset
   811
  file 'content1_missing_missing_content4-tracked' was deleted in other [merge rev] but was modified in local [working copy].
42565
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   812
  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
4764e8436b2a filemerge: make last line of prompts <40 english chars (issue6158)
Kyle Lippincott <spectral@google.com>
parents: 39707
diff changeset
   813
  What do you want to do? u
27137
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   814
  merging missing_content2_content2_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   815
  merging missing_content2_content3_content3-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   816
  merging missing_content2_content3_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   817
  merging missing_content2_missing_content4-tracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   818
  merging missing_content2_missing_content4-untracked
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   819
  warning: conflicts while merging content1_content2_content1_content4-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   820
  warning: conflicts while merging content1_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   821
  warning: conflicts while merging content1_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   822
  warning: conflicts while merging content1_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   823
  warning: conflicts while merging content1_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   824
  warning: conflicts while merging missing_content2_content2_content4-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   825
  warning: conflicts while merging missing_content2_content3_content3-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   826
  warning: conflicts while merging missing_content2_content3_content4-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   827
  warning: conflicts while merging missing_content2_missing_content4-tracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   828
  warning: conflicts while merging missing_content2_missing_content4-untracked! (edit, then use 'hg resolve --mark')
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   829
  [1]
25e4b2f000c5 merge: move almost all change/delete conflicts to resolve phase (BC) (API)
Siddharth Agarwal <sid0@fb.com>
parents: 27133
diff changeset
   830
  $ checkstatus > $TESTTMP/status2 2>&1
27557
28b5c4fcf48d tests: Solaris diff -U also emits "No differences encountered"
Danek Duvall <danek.duvall@oracle.com>
parents: 27163
diff changeset
   831
  $ cmp $TESTTMP/status1 $TESTTMP/status2 || diff -U8 $TESTTMP/status1 $TESTTMP/status2
28021
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   832
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   833
Set up working directory again
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   834
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   835
  $ hg -q update --clean 2
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   836
  $ hg --config extensions.purge= purge
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 39285
diff changeset
   837
  $ "$PYTHON" $TESTDIR/generate-working-copy-states.py state 3 wc
28021
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   838
  $ hg addremove -q --similarity 0
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   839
  $ hg forget *_*_*_*-untracked
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   840
  $ rm *_*_*_missing-*
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   841
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   842
Merge with checkunknown = warn, see that behavior is the same as before
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   843
  $ hg merge -f --tool internal:merge3 'desc("remote")' --config merge.checkunknown=warn > $TESTTMP/merge-output-2 2>&1
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   844
  [1]
d0d805df6a44 test-merge-force: add tests for merge.checkunknown=warn
Siddharth Agarwal <sid0@fb.com>
parents: 27599
diff changeset
   845
  $ cmp $TESTTMP/merge-output-1 $TESTTMP/merge-output-2 || diff -U8 $TESTTMP/merge-output-1 $TESTTMP/merge-output-2