tests/test-up-local-change.t
author Denis Laxalde <denis.laxalde@logilab.fr>
Sat, 11 Jun 2016 20:59:49 +0200
changeset 29350 35861cc1076e
parent 28318 564a354f7f35
child 30200 a2804ddcf9ae
permissions -rw-r--r--
tests: drop a duplicated instruction
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     1
  $ HGMERGE=true; export HGMERGE
4365
46280c004f22 change tests to use simplemerge by default
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3199
diff changeset
     2
13956
ffb5c09ba822 tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents: 12681
diff changeset
     3
  $ hg init r1
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     4
  $ cd r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     5
  $ echo a > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     6
  $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     7
  adding a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
     8
  $ hg commit -m "1"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
     9
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    10
  $ hg clone . ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    11
  updating to branch default
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    12
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    13
  $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    14
  $ hg up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    15
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    16
  $ echo abc > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    17
  $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    18
  diff -r c19d34741b0a a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    19
  --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    20
  +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    21
  @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    22
  -a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    23
  +abc
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    24
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    25
  $ cd ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    26
  $ echo b > b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    27
  $ echo a2 > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    28
  $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    29
  adding b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    30
  $ hg commit -m "2"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    31
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    32
  $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    33
  $ hg -q pull ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    34
  $ hg status
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    35
  M a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    36
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    37
  changeset:   0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    38
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    39
  date:        Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    40
  summary:     1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    41
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    42
  $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    43
    searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    44
    unmatched files in other:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    45
     b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    46
  resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
    47
   branchmerge: False, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15619
diff changeset
    48
   ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
    49
   preserving a for resolve of a
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
    50
   b: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
    51
  getting b
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
    52
   a: versions differ -> 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
    53
  picked tool 'true' for a (binary False symlink False changedelete False)
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    54
  merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    55
  my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
    56
   a: versions differ -> m (merge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
    57
  picked tool 'true' for a (binary False symlink False changedelete False)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
    58
  my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
    59
  launching merge tool: true *$TESTTMP/r2/a* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23479
diff changeset
    60
  merge tool returned: 0
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    61
  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    62
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    63
  changeset:   1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    64
  tag:         tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    65
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    66
  date:        Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    67
  summary:     2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    68
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    69
  $ hg --debug up 0
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    70
  resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
    71
   branchmerge: False, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15619
diff changeset
    72
   ancestor: 1e71731e6fbb, local: 1e71731e6fbb+, remote: c19d34741b0a
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
    73
   preserving a for resolve of a
18541
5ed6a375e9ca merge: delay debug messages for merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 16913
diff changeset
    74
   b: other deleted -> r
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
    75
  removing b
28318
564a354f7f35 tests: flag Windows specific lines about background closing as optional
Matt Harbison <matt_harbison@yahoo.com>
parents: 28065
diff changeset
    76
  starting 4 threads for background file closing (?)
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
    77
   a: versions differ -> 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
    78
  picked tool 'true' for a (binary False symlink False changedelete False)
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    79
  merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    80
  my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
    81
   a: versions differ -> m (merge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
    82
  picked tool 'true' for a (binary False symlink False changedelete False)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
    83
  my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
    84
  launching merge tool: true *$TESTTMP/r2/a* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23479
diff changeset
    85
  merge tool returned: 0
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    86
  0 files updated, 1 files merged, 1 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    87
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    88
  changeset:   0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    89
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    90
  date:        Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    91
  summary:     1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    92
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    93
  $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    94
    searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    95
    unmatched files in other:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    96
     b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    97
  resolving manifests
18605
bcf29565d89f manifestmerge: pass in branchmerge and force separately
Siddharth Agarwal <sid0@fb.com>
parents: 18541
diff changeset
    98
   branchmerge: False, force: False, partial: False
15625
efdcce3fd2d5 merge: make debug output easier to read
Martin Geisler <mg@aragost.com>
parents: 15619
diff changeset
    99
   ancestor: c19d34741b0a, local: c19d34741b0a+, remote: 1e71731e6fbb
21391
cb15835456cb merge: change debug logging - test output changes but no real changes
Mads Kiilerich <madski@unity3d.com>
parents: 21389
diff changeset
   100
   preserving a for resolve of a
21389
e741972017d9 merge: change priority / ordering of merge actions
Mads Kiilerich <madski@unity3d.com>
parents: 20641
diff changeset
   101
   b: remote created -> g
18631
e2dc5397bc82 tests: update test output (will be folded into parent)
Bryan O'Sullivan <bryano@fb.com>
parents: 18605
diff changeset
   102
  getting b
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
   103
   a: versions differ -> 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
   104
  picked tool 'true' for a (binary False symlink False changedelete False)
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   105
  merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   106
  my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
26618
8e6d5b7317e6 merge.mergestate: perform all premerges before any merges (BC)
Siddharth Agarwal <sid0@fb.com>
parents: 26611
diff changeset
   107
   a: versions differ -> m (merge)
27161
296d55def9c4 filemerge: add debug output for whether this is a change/delete conflict
Siddharth Agarwal <sid0@fb.com>
parents: 26618
diff changeset
   108
  picked tool 'true' for a (binary False symlink False changedelete False)
26611
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
   109
  my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
a5ff66e6d77a filemerge: break overall filemerge into separate premerge and merge steps
Siddharth Agarwal <sid0@fb.com>
parents: 25125
diff changeset
   110
  launching merge tool: true *$TESTTMP/r2/a* * * (glob)
24727
5668202cfaaf merge: better debug messages before/after invoking external merge tool
Mads Kiilerich <mads@kiilerich.com>
parents: 23479
diff changeset
   111
  merge tool returned: 0
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   112
  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   113
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   114
  changeset:   1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   115
  tag:         tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   116
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   117
  date:        Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   118
  summary:     2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   119
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   120
  $ hg -v history
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   121
  changeset:   1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   122
  tag:         tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   123
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   124
  date:        Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   125
  files:       a b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   126
  description:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   127
  2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   128
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   129
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   130
  changeset:   0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   131
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   132
  date:        Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   133
  files:       a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   134
  description:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   135
  1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   136
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   137
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   138
  $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   139
  diff -r 1e71731e6fbb a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   140
  --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   141
  +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   142
  @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   143
  -a2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   144
  +abc
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
   145
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   146
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   147
create a second head
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   148
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   149
  $ cd ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   150
  $ hg up 0
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   151
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   152
  $ echo b2 > b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   153
  $ echo a3 > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   154
  $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   155
  adding b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   156
  $ hg commit -m "3"
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   157
  created new head
1674
dee55c4a4963 abort when using 'update -m' and this is not a merge
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1581
diff changeset
   158
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   159
  $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   160
  $ hg -q pull ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   161
  $ hg status
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   162
  M a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   163
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   164
  changeset:   1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   165
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   166
  date:        Thu Jan 01 00:00:00 1970 +0000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   167
  summary:     2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   168
  
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   169
  $ hg --debug up
28065
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27161
diff changeset
   170
  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
6b1fc09c699a update: change default destination to tipmost descendant (issue4673) (BC)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27161
diff changeset
   171
  1 other heads for branch "default"
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   172
23477
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   173
test conflicting untracked files
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   174
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   175
  $ hg up -qC 0
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   176
  $ echo untracked > b
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   177
  $ hg st
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   178
  ? b
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   179
  $ hg up 1
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   180
  b: untracked file differs
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   181
  abort: untracked files in working directory differ from files in requested revision
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   182
  [255]
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   183
  $ rm b
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   184
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   185
test conflicting untracked ignored file
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   186
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   187
  $ hg up -qC 0
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   188
  $ echo ignored > .hgignore
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   189
  $ hg add .hgignore
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   190
  $ hg ci -m 'add .hgignore'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   191
  created new head
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   192
  $ echo ignored > ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   193
  $ hg add ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   194
  $ hg ci -m 'add ignored file'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   195
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   196
  $ hg up -q 'desc("add .hgignore")'
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   197
  $ echo untracked > ignored
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   198
  $ hg st
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   199
  $ hg up 'desc("add ignored file")'
23478
30b602168c3b update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents: 23477
diff changeset
   200
  ignored: untracked file differs
30b602168c3b update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents: 23477
diff changeset
   201
  abort: untracked files in working directory differ from files in requested revision
30b602168c3b update: don't overwrite untracked ignored files on update
Martin von Zweigbergk <martinvonz@google.com>
parents: 23477
diff changeset
   202
  [255]
23477
689540e6007e update: add tests for untracked local file
Martin von Zweigbergk <martinvonz@google.com>
parents: 21391
diff changeset
   203
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   204
test a local add
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   205
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   206
  $ cd ..
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   207
  $ hg init a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   208
  $ hg init b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   209
  $ echo a > a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   210
  $ echo a > b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   211
  $ hg --cwd a commit -A -m a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   212
  adding a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   213
  $ cd b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   214
  $ hg add a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   215
  $ hg pull -u ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   216
  pulling from ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   217
  requesting all changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   218
  adding changesets
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   219
  adding manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   220
  adding file changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   221
  added 1 changesets with 1 changes to 1 files
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   222
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   223
  $ hg st
16913
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15625
diff changeset
   224
f2719b387380 tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents: 15625
diff changeset
   225
  $ cd ..