tests/test-issue1438.t
author Kevin Bullock <kbullock@ringworld.org>
Tue, 20 Dec 2011 14:11:14 -0600
branchstable
changeset 15701 32a6e00e4cfe
parent 12328 b63f6422d2a7
child 22046 7a9cbb315d84
permissions -rw-r--r--
graft: use consistent language in help Removes the word 'aborted' from the 3rd paragraph in favor of 'interrupted', the same word used in the description of the -c/--continue switch. The word 'interrupted' is also consistent with the help for rebase.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12328
b63f6422d2a7 tests: fix a bunch of pointless #s in unified tests
Matt Mackall <mpm@selenic.com>
parents: 12204
diff changeset
     1
http://mercurial.selenic.com/bts/issue1438
7783
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     2
12204
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
     3
  $ "$TESTDIR/hghave" symlink || exit 80
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
     4
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
     5
  $ hg init
7783
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
     6
12204
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
     7
  $ ln -s foo link
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
     8
  $ hg add link
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
     9
  $ hg ci -mbad link
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    10
  $ hg rm link
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    11
  $ hg ci -mok
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    12
  $ hg diff -g -r 0:1 > bad.patch
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    13
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    14
  $ hg up 0
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    15
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    16
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    17
  $ hg import --no-commit bad.patch
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    18
  applying bad.patch
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    19
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    20
  $ hg status
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    21
  R link
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    22
  ? bad.patch
c55d69c5fb77 tests: unify test-issue1438 and test-issue2137
Adrian Buehlmann <adrian@cadifra.com>
parents: 7783
diff changeset
    23