tests/test-up-local-change.t
author Brodie Rao <brodie@bitheap.org>
Sat, 09 Oct 2010 17:02:28 -0500
changeset 12681 bc13e17067d9
parent 12365 22f3353bcc36
child 13956 ffb5c09ba822
permissions -rw-r--r--
update: use higher level wording for "crosses branches" error When using "hg update" to update to a revision on another branch, if the user has uncommitted changes in the working directory, hg aborts with the following message: abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) If the user isn't trying to update to tip and they follow the command examples verbatim, they would end up updating to the wrong revision. This patch removes the command examples in favor of just telling the user to either merge or use --clean: abort: crosses branches (merge branches or use --clean to discard changes) hg also aborts if the user tries to use "hg update" to get to tip (without specifying a revision) and tip is on another branch: abort: crosses branches (use 'hg merge' or use 'hg update -c') This message is changed in the same fashion: abort: crosses branches (merge branches or use --check to force update)
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
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     3
  $ mkdir r1
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
  $ hg init
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     6
  $ echo a > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     7
  $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
     8
  adding a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
     9
  $ hg commit -m "1"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    10
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    11
  $ hg clone . ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    12
  updating to branch default
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    13
  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
    14
  $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    15
  $ hg up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    16
  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
    17
  $ echo abc > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    18
  $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    19
  diff -r c19d34741b0a a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    20
  --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    21
  +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    22
  @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    23
  -a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    24
  +abc
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    25
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    26
  $ cd ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    27
  $ echo b > b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    28
  $ echo a2 > a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    29
  $ hg addremove
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    30
  adding b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    31
  $ hg commit -m "2"
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
    32
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    33
  $ cd ../r2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    34
  $ hg -q pull ../r1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    35
  $ hg status
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    36
  M a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    37
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    38
  changeset:   0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    39
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    40
  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
    41
  summary:     1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    42
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    43
  $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    44
    searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    45
    unmatched files in other:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    46
     b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    47
  resolving manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    48
   overwrite False partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    49
   ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    50
   a: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    51
   b: remote created -> g
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    52
  preserving a for resolve of a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    53
  updating: a 1/2 files (50.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    54
  picked tool 'true' for a (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    55
  merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    56
  my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    57
  updating: b 2/2 files (100.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    58
  getting b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    59
  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
    60
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    61
  changeset:   1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    62
  tag:         tip
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    63
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    64
  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
    65
  summary:     2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    66
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    67
  $ hg --debug up 0
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    68
  resolving manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    69
   overwrite False partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    70
   ancestor 1e71731e6fbb local 1e71731e6fbb+ remote c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    71
   a: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    72
   b: other deleted -> r
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    73
  preserving a for resolve of a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    74
  updating: b 1/2 files (50.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    75
  removing b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    76
  updating: a 2/2 files (100.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    77
  picked tool 'true' for a (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    78
  merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    79
  my a@1e71731e6fbb+ other a@c19d34741b0a ancestor a@1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    80
  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
    81
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    82
  changeset:   0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    83
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    84
  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
    85
  summary:     1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    86
  
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    87
  $ hg --debug merge
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    88
  abort: there is nothing to merge - use "hg update" instead
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
    89
  [255]
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    90
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    91
  changeset:   0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    92
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
    93
  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
    94
  summary:     1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    95
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    96
  $ hg --debug up
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    97
    searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    98
    unmatched files in other:
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
    99
     b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   100
  resolving manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   101
   overwrite False partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   102
   ancestor c19d34741b0a local c19d34741b0a+ remote 1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   103
   a: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   104
   b: remote created -> g
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   105
  preserving a for resolve of a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   106
  updating: a 1/2 files (50.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   107
  picked tool 'true' for a (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   108
  merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   109
  my a@c19d34741b0a+ other a@1e71731e6fbb ancestor a@c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   110
  updating: b 2/2 files (100.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   111
  getting b
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
12681
bc13e17067d9 update: use higher level wording for "crosses branches" error
Brodie Rao <brodie@bitheap.org>
parents: 12365
diff changeset
   170
  abort: crosses branches (merge branches or use --clean to discard changes)
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   171
  [255]
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   172
  $ hg --debug merge
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   173
  abort: outstanding uncommitted changes (use 'hg status' to list changes)
12365
22f3353bcc36 tests: cleanup exit code handling in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
   174
  [255]
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   175
  $ hg --debug merge -f
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   176
    searching for copies back to rev 1
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   177
  resolving manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   178
   overwrite False partial False
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   179
   ancestor c19d34741b0a local 1e71731e6fbb+ remote 83c51d0caff4
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   180
   a: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   181
   b: versions differ -> m
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   182
  preserving a for resolve of a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   183
  preserving b for resolve of b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   184
  updating: a 1/2 files (50.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   185
  picked tool 'true' for a (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   186
  merging a
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   187
  my a@1e71731e6fbb+ other a@83c51d0caff4 ancestor a@c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   188
  updating: b 2/2 files (100.00%)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   189
  picked tool 'true' for b (binary False symlink False)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   190
  merging b
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   191
  my b@1e71731e6fbb+ other b@83c51d0caff4 ancestor b@000000000000
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   192
  0 files updated, 2 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
   193
  (branch merge, don't forget to commit)
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   194
  $ hg parents
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   195
  changeset:   1:1e71731e6fbb
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   196
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   197
  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
   198
  summary:     2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   199
  
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   200
  changeset:   2:83c51d0caff4
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   201
  tag:         tip
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   202
  parent:      0:c19d34741b0a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   203
  user:        test
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   204
  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
   205
  summary:     3
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   206
  
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   207
  $ hg diff --nodates
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12120
diff changeset
   208
  diff -r 1e71731e6fbb a
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   209
  --- a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   210
  +++ b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   211
  @@ -1,1 +1,1 @@
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   212
  -a2
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   213
  +abc
2065
2ff37e3bf780 fix update when a locally added file match the target revision
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents: 1933
diff changeset
   214
12120
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   215
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   216
test a local add
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   217
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   218
  $ cd ..
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   219
  $ hg init a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   220
  $ hg init b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   221
  $ echo a > a/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   222
  $ echo a > b/a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   223
  $ hg --cwd a commit -A -m a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   224
  adding a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   225
  $ cd b
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   226
  $ hg add a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   227
  $ hg pull -u ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   228
  pulling from ../a
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   229
  requesting all changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   230
  adding changesets
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   231
  adding manifests
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   232
  adding file changes
aeef24027906 tests: unify test-up-local-change
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 4659
diff changeset
   233
  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
   234
  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
   235
  $ hg st