tests/test-pull-r.t
author Patrick Mezard <pmezard@gmail.com>
Mon, 24 Jan 2011 23:25:46 +0100
changeset 13295 fb446228c0d4
parent 12316 4134686b83e1
child 13446 1e497df514e2
permissions -rw-r--r--
record: do not include files into changes count This turns the prompt sequence from something like: $ examine changes to foo? $ record change 1/4 to foo? $ record change 2/4 to foo? $ examine changes to bar? $ record change 4/4 to bar? into: $ examine changes to foo? $ record change 1/3 to foo? $ record change 2/3 to foo? $ examine change to bar? $ record change 3/3 to bar?
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     1
  $ hg init repo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     2
  $ cd repo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     3
  $ echo foo > foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     4
  $ hg ci -qAm 'add foo'
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     5
  $ echo >> foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     6
  $ hg ci -m 'change foo'
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     7
  $ hg up -qC 0
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     8
  $ echo bar > bar
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
     9
  $ hg ci -qAm 'add bar'
5221
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    10
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    11
  $ hg log
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    12
  changeset:   2:effea6de0384
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    13
  tag:         tip
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    14
  parent:      0:bbd179dfa0a7
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    15
  user:        test
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    16
  date:        Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    17
  summary:     add bar
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    18
  
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    19
  changeset:   1:ed1b79f46b9a
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    20
  user:        test
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    21
  date:        Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    22
  summary:     change foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    23
  
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    24
  changeset:   0:bbd179dfa0a7
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    25
  user:        test
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    26
  date:        Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    27
  summary:     add foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    28
  
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    29
  $ cd ..
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    30
  $ hg init copy
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    31
  $ cd copy
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    32
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    33
Pull a missing revision:
5221
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    34
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    35
  $ hg pull -qr missing ../repo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    36
  abort: unknown revision 'missing'!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12279
diff changeset
    37
  [255]
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    38
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    39
Pull multiple revisions with update:
6405
b8346ae5d64b commands: fix shadowed repo module
Patrick Mezard <pmezard@gmail.com>
parents: 5221
diff changeset
    40
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    41
  $ hg pull -qu -r 0 -r 1 ../repo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    42
  $ hg -q parents
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    43
  0:bbd179dfa0a7
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    44
  $ hg rollback
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    45
  rolling back to revision -1 (undo pull)
10358
d42821cd5c96 pull: with -u and -r, update to the first revision given
Sune Foldager <cryo@cyanite.org>
parents: 8167
diff changeset
    46
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    47
  $ hg pull -qr 0 ../repo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    48
  $ hg log
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    49
  changeset:   0:bbd179dfa0a7
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    50
  tag:         tip
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    51
  user:        test
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    52
  date:        Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    53
  summary:     add foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    54
  
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    55
  $ hg pull -qr 1 ../repo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    56
  $ hg log
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    57
  changeset:   1:ed1b79f46b9a
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    58
  tag:         tip
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    59
  user:        test
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    60
  date:        Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    61
  summary:     change foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    62
  
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    63
  changeset:   0:bbd179dfa0a7
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    64
  user:        test
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    65
  date:        Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    66
  summary:     add foo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    67
  
5221
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    68
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    69
This used to abort: received changelog group is empty:
5221
8ede77c2d008 pull -r: pass the revisions as the heads argument of findincoming
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff changeset
    70
12279
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    71
  $ hg pull -qr 1 ../repo
28e2e3804f2e combine tests
Adrian Buehlmann <adrian@cadifra.com>
parents: 10358
diff changeset
    72