tests/test-copy-move-merge.t
author Simon Farnsworth <simonfar@fb.com>
Fri, 12 Aug 2016 06:01:42 -0700
changeset 29774 a7f8939641aa
parent 28627 d7af9b4ae7dd
child 29775 978b907d9b36
permissions -rw-r--r--
merge: use labels in prompts to the user Now that we persist the labels, we can consistently use the labels in prompts for the user without risk of confusion. This changes a huge amount of command output: This means that merge prompts like: no tool found to merge a keep (l)ocal, take (o)ther, or leave (u)nresolved? u and remote changed a which local deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c become: no tool found to merge a keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved? u and remote [source] changed a which local [dest] deleted use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c where "working copy" and "destination" were supplied by the command that requested the merge as labels for conflict markers, and thus should be human-friendly.
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
16795
e9ae770eff1c merge: show renamed on one and deleted on the other side in debug output
Thomas Arendsen Hein <thomas@intevation.de>
parents: 15625
diff changeset
    27
    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
18362
5a4f220fbfca copies: report found copies sorted
Mads Kiilerich <mads@kiilerich.com>
parents: 18360
diff changeset
    28
     src: 'a' -> dst: 'b' *
18135
a6fe1b9cc68f copies: make debug messages more sensible
Siddharth Agarwal <sid0@fb.com>
parents: 16913
diff changeset
    29
     src: 'a' -> dst: 'c' *
11972
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
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
    32
   branchmerge: True, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 13956
diff changeset
    33
   ancestor: b8bf91eeebbc, local: add3f11052fa+, remote: 17c05bb7fcb6
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 20945
diff changeset
    34
   preserving a for resolve of b
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 20945
diff changeset
    35
   preserving a for resolve of c
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 20945
diff changeset
    36
  removing a
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 27596
diff changeset
    37
  starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26517
diff changeset
    38
   b: remote moved from a -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
    39
  picked tool ':merge' for b (binary False symlink False changedelete False)
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    40
  merging a and b to b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11972
diff changeset
    41
  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
    42
   premerge successful
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26517
diff changeset
    43
   c: remote moved from a -> m (premerge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
    44
  picked tool ':merge' for c (binary False symlink False changedelete False)
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    45
  merging a and c to c
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 11972
diff changeset
    46
  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
    47
   premerge successful
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    48
  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
    49
  (branch merge, don't forget to commit)
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    50
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    51
file b
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    52
  $ cat b
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    53
  0
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    54
  1
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    55
  2
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
    56
11972
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    57
file c
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    58
  $ cat c
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    59
  0
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    60
  1
b708cadc6e8f tests: unify test-copy-move-merge
Pradeepkumar Gayam <in3xes@gmail.com>
parents: 5059
diff changeset
    61
  2
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
    62
26013
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    63
Test disabling copy tracing
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    64
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    65
- first verify copy metadata was kept
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    66
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    67
  $ hg up -qC 2
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    68
  $ hg rebase --keep -d 1 -b 2 --config extensions.rebase=
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    69
  rebasing 2:add3f11052fa "other" (tip)
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    70
  merging b and a to b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    71
  merging c and a to c
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    72
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    73
  $ cat b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    74
  0
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    75
  1
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    76
  2
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    77
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    78
- next verify copy metadata is lost when disabled
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    79
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    80
  $ hg strip -r . --config extensions.strip=
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    81
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    82
  saved backup bundle to $TESTTMP/t/.hg/strip-backup/550bd84c0cd3-fc575957-backup.hg (glob)
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    83
  $ hg up -qC 2
27596
c881367688fe test-copy-move-merge.t: explicitly request changed version
Siddharth Agarwal <sid0@fb.com>
parents: 27163
diff changeset
    84
  $ hg rebase --keep -d 1 -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True --config ui.interactive=True << EOF
c881367688fe test-copy-move-merge.t: explicitly request changed version
Siddharth Agarwal <sid0@fb.com>
parents: 27163
diff changeset
    85
  > c
c881367688fe test-copy-move-merge.t: explicitly request changed version
Siddharth Agarwal <sid0@fb.com>
parents: 27163
diff changeset
    86
  > EOF
26013
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    87
  rebasing 2:add3f11052fa "other" (tip)
29774
a7f8939641aa merge: use labels in prompts to the user
Simon Farnsworth <simonfar@fb.com>
parents: 28627
diff changeset
    88
  remote [source] changed a which local [dest] deleted
27163
27b89a0957ec filemerge: add a 'leave unresolved' option to change/delete prompts
Siddharth Agarwal <sid0@fb.com>
parents: 27161
diff changeset
    89
  use (c)hanged version, leave (d)eleted, or leave (u)nresolved? c
26013
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    90
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    91
  $ cat b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    92
  1
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    93
  2
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    94
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 16795
diff changeset
    95
  $ cd ..
26013
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    96
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    97
Verify disabling copy tracing still keeps copies from rebase source
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    98
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
    99
  $ hg init copydisable
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   100
  $ cd copydisable
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   101
  $ touch a
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   102
  $ hg ci -Aqm 'add a'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   103
  $ touch b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   104
  $ hg ci -Aqm 'add b, c'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   105
  $ hg cp b x
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   106
  $ echo x >> x
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   107
  $ hg ci -qm 'copy b->x'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   108
  $ hg up -q 1
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   109
  $ touch z
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   110
  $ hg ci -Aqm 'add z'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   111
  $ hg log -G -T '{rev} {desc}\n'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   112
  @  3 add z
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   113
  |
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   114
  | o  2 copy b->x
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   115
  |/
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   116
  o  1 add b, c
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   117
  |
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   118
  o  0 add a
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   119
  
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   120
  $ hg rebase -d . -b 2 --config extensions.rebase= --config experimental.disablecopytrace=True
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   121
  rebasing 2:6adcf8c12e7d "copy b->x"
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   122
  saved backup bundle to $TESTTMP/copydisable/.hg/strip-backup/6adcf8c12e7d-ce4b3e75-backup.hg (glob)
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   123
  $ hg up -q 3
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   124
  $ hg log -f x -T '{rev} {desc}\n'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   125
  3 copy b->x
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   126
  1 add b, c
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   127
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   128
  $ cd ../
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   129
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   130
Verify we duplicate existing copies, instead of detecting them
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   131
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   132
  $ hg init copydisable3
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   133
  $ cd copydisable3
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   134
  $ touch a
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   135
  $ hg ci -Aqm 'add a'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   136
  $ hg cp a b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   137
  $ hg ci -Aqm 'copy a->b'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   138
  $ hg mv b c
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   139
  $ hg ci -Aqm 'move b->c'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   140
  $ hg up -q 0
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   141
  $ hg cp a b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   142
  $ echo b >> b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   143
  $ hg ci -Aqm 'copy a->b (2)'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   144
  $ hg log -G -T '{rev} {desc}\n'
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   145
  @  3 copy a->b (2)
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   146
  |
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   147
  | o  2 move b->c
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   148
  | |
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   149
  | o  1 copy a->b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   150
  |/
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   151
  o  0 add a
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   152
  
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   153
  $ hg rebase -d 2 -s 3 --config extensions.rebase= --config experimental.disablecopytrace=True
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   154
  rebasing 3:47e1a9e6273b "copy a->b (2)" (tip)
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   155
  saved backup bundle to $TESTTMP/copydisable3/.hg/strip-backup/47e1a9e6273b-2d099c59-backup.hg (glob)
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   156
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   157
  $ hg log -G -f b
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   158
  @  changeset:   3:76024fb4b05b
28627
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28318
diff changeset
   159
  :  tag:         tip
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28318
diff changeset
   160
  :  user:        test
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28318
diff changeset
   161
  :  date:        Thu Jan 01 00:00:00 1970 +0000
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28318
diff changeset
   162
  :  summary:     copy a->b (2)
d7af9b4ae7dd graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents: 28318
diff changeset
   163
  :
26013
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   164
  o  changeset:   0:ac82d8b1f7c4
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   165
     user:        test
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   166
     date:        Thu Jan 01 00:00:00 1970 +0000
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   167
     summary:     add a
38f92d12357c copy: add flag for disabling copy tracing
Durham Goode <durham@fb.com>
parents: 25125
diff changeset
   168