tests/test-copy-move-merge.t
author Matt Mackall <mpm@selenic.com>
Tue, 01 Nov 2011 15:19:37 -0500
branchstable
changeset 15399 41453d55b481
parent 13956 ffb5c09ba822
child 15625 efdcce3fd2d5
permissions -rw-r--r--
dirstate: don't fail when dropping a not-tracked file (issue3080) Complex merges with divergent renames can cause a file to be 'moved' twice, causing dirstate.drop() to be called twice. Rather than try to ensure there are no unexpected corner cases where this can happen, we simply ignore drops of files that aren't tracked.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12156
diff changeset
     1
  $ hg init t
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
     2
  $ cd t
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     3
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
     4
  $ echo 1 > a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11972
diff changeset
     5
  $ hg ci -qAm "first"
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     6
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
     7
  $ hg cp a b
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
     8
  $ hg mv a c
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
     9
  $ echo 2 >> b
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    10
  $ echo 2 >> c
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    11
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11972
diff changeset
    12
  $ hg ci -qAm "second"
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    13
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    14
  $ hg co -C 0
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    15
  1 files updated, 0 files merged, 2 files removed, 0 files unresolved
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    16
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    17
  $ echo 0 > a
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    18
  $ echo 1 >> a
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    19
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11972
diff changeset
    20
  $ hg ci -qAm "other"
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    21
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    22
  $ hg merge --debug
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    23
    searching for copies back to rev 1
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    24
    unmatched files in other:
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    25
     b
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    26
     c
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    27
    all copies found (* = to merge, ! = divergent):
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    28
     c -> a *
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    29
     b -> a *
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    30
    checking for directory renames
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    31
  resolving manifests
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    32
   overwrite None partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11972
diff changeset
    33
   ancestor b8bf91eeebbc local add3f11052fa+ remote 17c05bb7fcb6
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    34
   a: remote moved to c -> m
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    35
   a: remote moved to b -> m
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    36
  preserving a for resolve of b
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    37
  preserving a for resolve of c
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    38
  removing a
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    39
  updating: a 1/2 files (50.00%)
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    40
  picked tool 'internal:merge' for b (binary False symlink False)
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    41
  merging a and b to b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11972
diff changeset
    42
  my b@add3f11052fa+ other b@17c05bb7fcb6 ancestor a@b8bf91eeebbc
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    43
   premerge successful
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    44
  updating: a 2/2 files (100.00%)
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    45
  picked tool 'internal:merge' for c (binary False symlink False)
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    46
  merging a and c to c
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11972
diff changeset
    47
  my c@add3f11052fa+ other c@17c05bb7fcb6 ancestor a@b8bf91eeebbc
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    48
   premerge successful
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    49
  0 files updated, 2 files merged, 0 files removed, 0 files unresolved
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    50
  (branch merge, don't forget to commit)
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    51
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    52
file b
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    53
  $ cat b
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    54
  0
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    55
  1
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    56
  2
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    57
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    58
file c
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    59
  $ cat c
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    60
  0
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    61
  1
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    62
  2