view tests/test-symlinks.out @ 10396:65a90c8e11ee

prepush: add more precise error messages

Part of the patch is from [e-mail]

- indicate the branch name where there are multiple heads
- give better advice when hitting a possible race, where new heads are added
  between discovery and the call to branchmap(). In that case, asking the user
  to merge isn't helpful, since only remote has the changes.

adding bar
adding foo
adding bomb
adding a.c
adding dir/a.o
adding dir/b.o
M dir/b.o
! a.c
! dir/a.o
? .hgignore
a.c: unsupported file type (type is fifo)
! a.c
# test absolute path through symlink outside repo
A f
# try symlink outside repo to file inside
abort: ../z not under root
# try cloning symlink in a subdir
1. commit a symlink
? a/b/c/demo
adding a/b/c/demo
2. clone it
updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# git symlink diff
diff --git a/a/b/c/demo b/a/b/c/demo
new file mode 120000
--- /dev/null
+++ b/a/b/c/demo
@@ -0,0 +1,1 @@
+/path/to/symlink/source
\ No newline at end of file
# import git symlink diff
applying ../sl.diff
diff --git a/a/b/c/demo b/a/b/c/demo
new file mode 120000
--- /dev/null
+++ b/a/b/c/demo
@@ -0,0 +1,1 @@
+/path/to/symlink/source
\ No newline at end of file