tests/test-mv-cp-st-diff.t
author Matt Mackall <mpm@selenic.com>
Wed, 04 Jan 2012 17:55:30 -0600
changeset 15775 91eb4512edd0
parent 15447 9910f60a37ee
child 17345 4f8054d3171b
permissions -rw-r--r--
copies: rewrite copy detection for non-merge users The existing copy detection API was designed with merge in mind and was ill-suited for doing status/diff. The new pathcopies implementation gives more accurate, easier to use results for comparing two revisions, and is much simpler to understand. Test notes: - test-mv-cp-st.t results finds more renames in the reverse direction now - test-mq-merge.t was always wrong and duplicated a copy in diff that was already present in one of the parent revisions
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     1
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
     2
  $ add()
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
     3
  > {
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
     4
  >     echo $2 >> $1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
     5
  > }
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
     6
  $ hg init t
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
     7
  $ cd t
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     8
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
     9
set up a boring main branch
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    10
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    11
  $ add a a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    12
  $ hg add a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    13
  $ mkdir x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    14
  $ add x/x x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    15
  $ hg add x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    16
  $ hg ci -m0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    17
  $ add a m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    18
  $ hg ci -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    19
  $ add a m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    20
  $ add x/y y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    21
  $ hg add x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    22
  $ hg ci -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    23
  $ cd ..
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    24
  $ show()
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    25
  > {
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    26
  >     echo "- $2: $1"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    27
  >     hg st -C $1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    28
  >     echo
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    29
  >     hg diff --git $1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    30
  >     echo
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    31
  > }
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    32
  $ count=0
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    33
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    34
make a new branch and get diff/status output
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    35
$1 - first commit
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    36
$2 - second commit
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    37
$3 - working dir action
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    38
$4 - test description
6278
81e7112b07ae copies: add tests for status -C/diff --git
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    39
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    40
  $ tb()
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    41
  > {
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    42
  >     hg clone t t2 ; cd t2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    43
  >     hg co -q -C 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    44
  > 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    45
  >     add a $count
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    46
  >     count=`expr $count + 1`
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    47
  >     hg ci -m "t0"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    48
  >     $1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    49
  >     hg ci -m "t1"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    50
  >     $2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    51
  >     hg ci -m "t2"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    52
  >     $3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    53
  > 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    54
  >     echo "** $4 **"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    55
  >     echo "** $1 / $2 / $3"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    56
  >     show "" "working to parent"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    57
  >     show "--rev 0" "working to root"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    58
  >     show "--rev 2" "working to branch"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    59
  >     show "--rev 0 --rev ." "root to parent"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    60
  >     show "--rev . --rev 0" "parent to root"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    61
  >     show "--rev 2 --rev ." "branch to parent"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    62
  >     show "--rev . --rev 2" "parent to branch"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    63
  >     echo
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    64
  >     cd ..
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    65
  >     rm -rf t2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    66
  > }
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    67
  $ tb "add a a1" "add a a2" "hg mv a b" "rename in working dir"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    68
  updating to branch default
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    69
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    70
  created new head
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    71
  ** rename in working dir **
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    72
  ** add a a1 / add a a2 / hg mv a b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    73
  - working to parent: 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    74
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    75
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    76
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    77
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    78
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    79
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    80
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    81
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    82
  - working to root: --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    83
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    84
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    85
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    86
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    87
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    88
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    89
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    90
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    91
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    92
  @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    93
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    94
  +0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    95
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    96
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    97
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    98
  - working to branch: --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
    99
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   100
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   101
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   102
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   103
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   104
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   105
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   106
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   107
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   108
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   109
  @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   110
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   111
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   112
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   113
  +0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   114
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   115
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   116
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   117
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   118
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   119
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   120
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   121
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   122
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   123
  - root to parent: --rev 0 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   124
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   125
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   126
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   127
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   128
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   129
  @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   130
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   131
  +0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   132
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   133
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   134
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   135
  - parent to root: --rev . --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   136
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   137
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   138
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   139
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   140
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   141
  @@ -1,4 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   142
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   143
  -0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   144
  -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   145
  -a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   146
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   147
  - branch to parent: --rev 2 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   148
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   149
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   150
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   151
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   152
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   153
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   154
  @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   155
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   156
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   157
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   158
  +0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   159
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   160
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   161
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   162
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   163
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   164
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   165
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   166
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   167
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   168
  - parent to branch: --rev . --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   169
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   170
  A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   171
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   172
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   173
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   174
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   175
  @@ -1,4 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   176
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   177
  -0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   178
  -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   179
  -a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   180
  +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   181
  +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   182
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   183
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   184
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   185
  +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   186
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   187
  +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   188
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   189
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   190
  $ tb "add a a1" "add a a2" "hg cp a b" "copy in working dir" 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   191
  updating to branch default
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   192
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   193
  created new head
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   194
  ** copy in working dir **
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   195
  ** add a a1 / add a a2 / hg cp a b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   196
  - working to parent: 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   197
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   198
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   199
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   200
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   201
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   202
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   203
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   204
  - working to root: --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   205
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   206
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   207
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   208
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   209
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   210
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   211
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   212
  @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   213
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   214
  +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   215
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   216
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   217
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   218
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   219
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   220
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   221
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   222
  @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   223
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   224
  +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   225
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   226
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   227
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   228
  - working to branch: --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   229
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   230
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   231
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   232
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   233
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   234
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   235
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   236
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   237
  @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   238
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   239
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   240
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   241
  +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   242
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   243
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   244
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   245
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   246
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   247
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   248
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   249
  @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   250
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   251
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   252
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   253
  +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   254
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   255
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   256
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   257
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   258
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   259
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   260
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   261
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   262
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   263
  - root to parent: --rev 0 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   264
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   265
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   266
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   267
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   268
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   269
  @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   270
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   271
  +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   272
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   273
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   274
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   275
  - parent to root: --rev . --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   276
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   277
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   278
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   279
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   280
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   281
  @@ -1,4 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   282
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   283
  -1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   284
  -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   285
  -a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   286
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   287
  - branch to parent: --rev 2 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   288
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   289
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   290
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   291
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   292
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   293
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   294
  @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   295
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   296
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   297
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   298
  +1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   299
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   300
  +a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   301
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   302
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   303
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   304
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   305
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   306
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   307
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   308
  - parent to branch: --rev . --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   309
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   310
  A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   311
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   312
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   313
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   314
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   315
  @@ -1,4 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   316
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   317
  -1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   318
  -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   319
  -a2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   320
  +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   321
  +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   322
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   323
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   324
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   325
  +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   326
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   327
  +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   328
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   329
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   330
  $ tb "hg mv a b" "add b b1" "add b w" "single rename"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   331
  updating to branch default
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   332
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   333
  created new head
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   334
  ** single rename **
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   335
  ** hg mv a b / add b b1 / add b w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   336
  - working to parent: 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   337
  M b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   338
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   339
  diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   340
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   341
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   342
  @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   343
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   344
   2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   345
   b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   346
  +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   347
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   348
  - working to root: --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   349
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   350
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   351
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   352
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   353
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   354
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   355
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   356
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   357
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   358
  @@ -1,1 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   359
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   360
  +2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   361
  +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   362
  +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   363
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   364
  - working to branch: --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   365
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   366
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   367
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   368
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   369
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   370
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   371
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   372
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   373
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   374
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   375
  @@ -1,3 +1,4 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   376
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   377
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   378
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   379
  +2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   380
  +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   381
  +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   382
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   383
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   384
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   385
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   386
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   387
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   388
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   389
  - root to parent: --rev 0 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   390
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   391
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   392
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   393
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   394
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   395
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   396
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   397
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   398
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   399
  @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   400
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   401
  +2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   402
  +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   403
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   404
  - parent to root: --rev . --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   405
  A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   406
    b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   407
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   408
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   409
  diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   410
  rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   411
  rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   412
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   413
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   414
  @@ -1,3 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   415
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   416
  -2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   417
  -b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   418
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   419
  - branch to parent: --rev 2 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   420
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   421
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   422
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   423
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   424
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   425
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   426
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   427
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   428
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   429
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   430
  @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   431
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   432
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   433
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   434
  +2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   435
  +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   436
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   437
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   438
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   439
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   440
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   441
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   442
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   443
  - parent to branch: --rev . --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   444
  A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   445
    b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   446
  A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   447
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   448
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   449
  diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   450
  rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   451
  rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   452
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   453
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   454
  @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   455
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   456
  -2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   457
  -b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   458
  +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   459
  +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   460
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   461
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   462
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   463
  +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   464
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   465
  +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   466
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   467
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   468
  $ tb "hg cp a b" "add b b1" "add a w" "single copy"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   469
  updating to branch default
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   470
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   471
  created new head
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   472
  ** single copy **
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   473
  ** hg cp a b / add b b1 / add a w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   474
  - working to parent: 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   475
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   476
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   477
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   478
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   479
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   480
  @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   481
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   482
   3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   483
  +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   484
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   485
  - working to root: --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   486
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   487
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   488
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   489
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   490
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   491
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   492
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   493
  @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   494
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   495
  +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   496
  +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   497
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   498
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   499
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   500
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   501
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   502
  @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   503
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   504
  +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   505
  +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   506
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   507
  - working to branch: --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   508
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   509
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   510
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   511
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   512
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   513
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   514
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   515
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   516
  @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   517
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   518
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   519
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   520
  +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   521
  +w
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   522
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   523
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   524
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   525
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   526
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   527
  @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   528
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   529
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   530
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   531
  +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   532
  +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   533
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   534
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   535
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   536
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   537
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   538
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   539
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   540
  - root to parent: --rev 0 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   541
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   542
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   543
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   544
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   545
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   546
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   547
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   548
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   549
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   550
  +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   551
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   552
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   553
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   554
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   555
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   556
  @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   557
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   558
  +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   559
  +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   560
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   561
  - parent to root: --rev . --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   562
  M a
15775
91eb4512edd0 copies: rewrite copy detection for non-merge users
Matt Mackall <mpm@selenic.com>
parents: 15447
diff changeset
   563
    b
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   564
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   565
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   566
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   567
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   568
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   569
  @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   570
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   571
  -3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   572
  diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   573
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   574
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   575
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   576
  @@ -1,3 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   577
  -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   578
  -3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   579
  -b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   580
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   581
  - branch to parent: --rev 2 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   582
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   583
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   584
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   585
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   586
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   587
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   588
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   589
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   590
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   591
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   592
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   593
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   594
  +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   595
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   596
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   597
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   598
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   599
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   600
  @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   601
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   602
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   603
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   604
  +3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   605
  +b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   606
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   607
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   608
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   609
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   610
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   611
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   612
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   613
  - parent to branch: --rev . --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   614
  M a
15775
91eb4512edd0 copies: rewrite copy detection for non-merge users
Matt Mackall <mpm@selenic.com>
parents: 15447
diff changeset
   615
    b
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   616
  A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   617
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   618
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   619
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   620
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   621
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   622
  @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   623
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   624
  -3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   625
  +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   626
  +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   627
  diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   628
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   629
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   630
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   631
  @@ -1,3 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   632
  -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   633
  -3
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   634
  -b1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   635
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   636
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   637
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   638
  +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   639
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   640
  +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   641
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   642
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   643
  $ tb "hg mv a b" "hg mv b c" "hg mv c d" "rename chain"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   644
  updating to branch default
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   645
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   646
  created new head
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   647
  ** rename chain **
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   648
  ** hg mv a b / hg mv b c / hg mv c d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   649
  - working to parent: 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   650
  A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   651
    c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   652
  R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   653
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   654
  diff --git a/c b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   655
  rename from c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   656
  rename to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   657
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   658
  - working to root: --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   659
  A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   660
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   661
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   662
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   663
  diff --git a/a b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   664
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   665
  rename to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   666
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   667
  +++ b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   668
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   669
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   670
  +4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   671
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   672
  - working to branch: --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   673
  A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   674
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   675
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   676
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   677
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   678
  diff --git a/a b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   679
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   680
  rename to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   681
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   682
  +++ b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   683
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   684
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   685
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   686
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   687
  +4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   688
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   689
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   690
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   691
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   692
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   693
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   694
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   695
  - root to parent: --rev 0 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   696
  A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   697
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   698
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   699
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   700
  diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   701
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   702
  rename to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   703
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   704
  +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   705
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   706
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   707
  +4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   708
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   709
  - parent to root: --rev . --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   710
  A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   711
    c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   712
  R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   713
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   714
  diff --git a/c b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   715
  rename from c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   716
  rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   717
  --- a/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   718
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   719
  @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   720
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   721
  -4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   722
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   723
  - branch to parent: --rev 2 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   724
  A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   725
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   726
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   727
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   728
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   729
  diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   730
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   731
  rename to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   732
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   733
  +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   734
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   735
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   736
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   737
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   738
  +4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   739
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   740
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   741
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   742
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   743
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   744
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   745
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   746
  - parent to branch: --rev . --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   747
  A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   748
    c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   749
  A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   750
  R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   751
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   752
  diff --git a/c b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   753
  rename from c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   754
  rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   755
  --- a/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   756
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   757
  @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   758
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   759
  -4
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   760
  +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   761
  +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   762
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   763
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   764
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   765
  +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   766
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   767
  +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   768
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   769
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   770
  $ tb "hg cp a b" "hg cp b c" "hg cp c d" "copy chain"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   771
  updating to branch default
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   772
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   773
  created new head
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   774
  ** copy chain **
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   775
  ** hg cp a b / hg cp b c / hg cp c d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   776
  - working to parent: 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   777
  A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   778
    c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   779
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   780
  diff --git a/c b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   781
  copy from c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   782
  copy to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   783
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   784
  - working to root: --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   785
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   786
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   787
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   788
  A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   789
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   790
  A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   791
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   792
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   793
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   794
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   795
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   796
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   797
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   798
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   799
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   800
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   801
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   802
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   803
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   804
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   805
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   806
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   807
  diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   808
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   809
  copy to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   810
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   811
  +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   812
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   813
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   814
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   815
  diff --git a/a b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   816
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   817
  copy to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   818
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   819
  +++ b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   820
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   821
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   822
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   823
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   824
  - working to branch: --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   825
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   826
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   827
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   828
  A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   829
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   830
  A d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   831
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   832
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   833
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   834
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   835
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   836
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   837
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   838
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   839
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   840
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   841
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   842
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   843
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   844
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   845
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   846
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   847
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   848
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   849
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   850
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   851
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   852
  diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   853
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   854
  copy to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   855
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   856
  +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   857
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   858
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   859
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   860
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   861
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   862
  diff --git a/a b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   863
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   864
  copy to d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   865
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   866
  +++ b/d
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   867
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   868
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   869
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   870
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   871
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   872
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   873
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   874
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   875
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   876
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   877
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   878
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   879
  - root to parent: --rev 0 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   880
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   881
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   882
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   883
  A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   884
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   885
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   886
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   887
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   888
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   889
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   890
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   891
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   892
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   893
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   894
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   895
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   896
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   897
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   898
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   899
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   900
  diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   901
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   902
  copy to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   903
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   904
  +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   905
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   906
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   907
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   908
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   909
  - parent to root: --rev . --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   910
  M a
15775
91eb4512edd0 copies: rewrite copy detection for non-merge users
Matt Mackall <mpm@selenic.com>
parents: 15447
diff changeset
   911
    b
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   912
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   913
  R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   914
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   915
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   916
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   917
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   918
  @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   919
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   920
  -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   921
  diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   922
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   923
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   924
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   925
  @@ -1,2 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   926
  -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   927
  -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   928
  diff --git a/c b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   929
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   930
  --- a/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   931
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   932
  @@ -1,2 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   933
  -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   934
  -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   935
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   936
  - branch to parent: --rev 2 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   937
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   938
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   939
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   940
  A c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   941
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   942
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   943
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   944
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   945
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   946
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   947
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   948
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   949
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   950
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   951
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   952
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   953
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   954
  copy to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   955
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   956
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   957
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   958
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   959
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   960
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   961
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   962
  diff --git a/a b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   963
  copy from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   964
  copy to c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   965
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   966
  +++ b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   967
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   968
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   969
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   970
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   971
  +5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   972
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   973
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   974
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   975
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   976
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   977
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   978
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   979
  - parent to branch: --rev . --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   980
  M a
15775
91eb4512edd0 copies: rewrite copy detection for non-merge users
Matt Mackall <mpm@selenic.com>
parents: 15447
diff changeset
   981
    b
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   982
  A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   983
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   984
  R c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   985
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   986
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   987
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   988
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   989
  @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   990
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   991
  -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   992
  +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   993
  +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   994
  diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   995
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   996
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   997
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   998
  @@ -1,2 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
   999
  -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1000
  -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1001
  diff --git a/c b/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1002
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1003
  --- a/c
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1004
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1005
  @@ -1,2 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1006
  -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1007
  -5
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1008
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1009
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1010
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1011
  +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1012
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1013
  +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1014
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1015
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1016
  $ tb "add a a1" "hg mv a b" "hg mv b a" "circular rename"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1017
  updating to branch default
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1018
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1019
  created new head
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1020
  ** circular rename **
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1021
  ** add a a1 / hg mv a b / hg mv b a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1022
  - working to parent: 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1023
  A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1024
    b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1025
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1026
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1027
  diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1028
  rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1029
  rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1030
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1031
  - working to root: --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1032
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1033
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1034
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1035
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1036
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1037
  @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1038
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1039
  +6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1040
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1041
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1042
  - working to branch: --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1043
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1044
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1045
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1046
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1047
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1048
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1049
  @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1050
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1051
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1052
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1053
  +6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1054
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1055
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1056
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1057
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1058
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1059
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1060
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1061
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1062
  - root to parent: --rev 0 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1063
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1064
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1065
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1066
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1067
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1068
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1069
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1070
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1071
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1072
  @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1073
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1074
  +6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1075
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1076
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1077
  - parent to root: --rev . --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1078
  A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1079
    b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1080
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1081
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1082
  diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1083
  rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1084
  rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1085
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1086
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1087
  @@ -1,3 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1088
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1089
  -6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1090
  -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1091
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1092
  - branch to parent: --rev 2 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1093
  A b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1094
    a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1095
  R a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1096
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1097
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1098
  diff --git a/a b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1099
  rename from a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1100
  rename to b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1101
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1102
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1103
  @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1104
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1105
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1106
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1107
  +6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1108
  +a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1109
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1110
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1111
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1112
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1113
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1114
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1115
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1116
  - parent to branch: --rev . --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1117
  A a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1118
    b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1119
  A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1120
  R b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1121
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1122
  diff --git a/b b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1123
  rename from b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1124
  rename to a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1125
  --- a/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1126
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1127
  @@ -1,3 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1128
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1129
  -6
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1130
  -a1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1131
  +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1132
  +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1133
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1134
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1135
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1136
  +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1137
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1138
  +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1139
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1140
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1141
  $ tb "hg mv x y" "add y/x x1" "add y/x x2" "directory move"
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1142
  updating to branch default
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1143
  3 files updated, 0 files merged, 0 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1144
  created new head
15447
9910f60a37ee tests: make (glob) on windows accept \ instead of /
Mads Kiilerich <mads@kiilerich.com>
parents: 12469
diff changeset
  1145
  moving x/x to y/x (glob)
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1146
  ** directory move **
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1147
  ** hg mv x y / add y/x x1 / add y/x x2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1148
  - working to parent: 
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1149
  M y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1150
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1151
  diff --git a/y/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1152
  --- a/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1153
  +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1154
  @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1155
   x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1156
   x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1157
  +x2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1158
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1159
  - working to root: --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1160
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1161
  A y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1162
    x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1163
  R x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1164
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1165
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1166
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1167
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1168
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1169
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1170
  +7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1171
  diff --git a/x/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1172
  rename from x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1173
  rename to y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1174
  --- a/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1175
  +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1176
  @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1177
   x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1178
  +x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1179
  +x2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1180
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1181
  - working to branch: --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1182
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1183
  A y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1184
    x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1185
  R x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1186
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1187
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1188
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1189
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1190
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1191
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1192
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1193
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1194
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1195
  +7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1196
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1197
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1198
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1199
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1200
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1201
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1202
  diff --git a/x/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1203
  rename from x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1204
  rename to y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1205
  --- a/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1206
  +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1207
  @@ -1,1 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1208
   x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1209
  +x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1210
  +x2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1211
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1212
  - root to parent: --rev 0 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1213
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1214
  A y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1215
    x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1216
  R x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1217
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1218
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1219
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1220
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1221
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1222
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1223
  +7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1224
  diff --git a/x/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1225
  rename from x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1226
  rename to y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1227
  --- a/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1228
  +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1229
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1230
   x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1231
  +x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1232
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1233
  - parent to root: --rev . --rev 0
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1234
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1235
  A x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1236
    y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1237
  R y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1238
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1239
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1240
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1241
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1242
  @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1243
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1244
  -7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1245
  diff --git a/y/x b/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1246
  rename from y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1247
  rename to x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1248
  --- a/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1249
  +++ b/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1250
  @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1251
   x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1252
  -x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1253
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1254
  - branch to parent: --rev 2 --rev .
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1255
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1256
  A y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1257
    x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1258
  R x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1259
  R x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1260
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1261
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1262
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1263
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1264
  @@ -1,3 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1265
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1266
  -m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1267
  -m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1268
  +7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1269
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1270
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1271
  --- a/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1272
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1273
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1274
  -y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1275
  diff --git a/x/x b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1276
  rename from x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1277
  rename to y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1278
  --- a/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1279
  +++ b/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1280
  @@ -1,1 +1,2 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1281
   x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1282
  +x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1283
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1284
  - parent to branch: --rev . --rev 2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1285
  M a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1286
  A x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1287
    y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1288
  A x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1289
  R y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1290
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1291
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1292
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1293
  +++ b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1294
  @@ -1,2 +1,3 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1295
   a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1296
  -7
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1297
  +m1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1298
  +m2
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1299
  diff --git a/y/x b/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1300
  rename from y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1301
  rename to x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1302
  --- a/y/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1303
  +++ b/x/x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1304
  @@ -1,2 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1305
   x
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1306
  -x1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1307
  diff --git a/x/y b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1308
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1309
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1310
  +++ b/x/y
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1311
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1312
  +y1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1313
  
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1314
  
6425
2d9328a2f81f copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents: 6286
diff changeset
  1315
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1316
Cannot implement unrelated branch with tb
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1317
testing copies with unrelated branch
6425
2d9328a2f81f copies: skip directory rename checks when not merging
Matt Mackall <mpm@selenic.com>
parents: 6286
diff changeset
  1318
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1319
  $ hg init unrelated
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1320
  $ cd unrelated
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1321
  $ add a a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1322
  $ hg ci -Am adda
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1323
  adding a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1324
  $ hg mv a b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1325
  $ hg ci -m movea
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1326
  $ hg up -C null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1327
  0 files updated, 0 files merged, 1 files removed, 0 files unresolved
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1328
  $ add a a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1329
  $ hg ci -Am addunrelateda
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1330
  adding a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1331
  created new head
10179
83cfa1baf8ad copies: don't report copies with unrelated branch
Patrick Mezard <pmezard@gmail.com>
parents: 8518
diff changeset
  1332
12469
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1333
unrelated branch diff
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1334
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1335
  $ hg diff --git -r 2 -r 1
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1336
  diff --git a/a b/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1337
  deleted file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1338
  --- a/a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1339
  +++ /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1340
  @@ -1,1 +0,0 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1341
  -a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1342
  diff --git a/b b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1343
  new file mode 100644
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1344
  --- /dev/null
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1345
  +++ b/b
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1346
  @@ -0,0 +1,1 @@
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1347
  +a
be6d33671c95 tests: unify test-mv-cp-st-diff
Matt Mackall <mpm@selenic.com>
parents: 10179
diff changeset
  1348
  $ cd ..