annotate tests/test-issue1438 @ 8545:3682a19bb637

merge: give hint as to how to discover uncommitted changes Many users will try 'hg diff' here, and it will not show them missing files.
author Steve Borho <steve@borho.org>
date Fri, 22 May 2009 11:42:21 -0500
parents 2c5b2abfb8be
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7783
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 #!/bin/sh
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 "$TESTDIR/hghave" symlink || exit 80
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 rm -rf a
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 hg init a
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 cd a
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 ln -s foo link
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 hg add link
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 hg ci -mbad link
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
11 hg rm link
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12 hg ci -mok
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 hg diff -g -r 0:1 > bad.patch
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14 hg up 0
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
15 hg import --no-commit bad.patch
2c5b2abfb8be patch: teach selectfile about symlinks (issue1438)
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
16 hg st