Hello everyone
I have problem when I want to merge the official development with my repository. My steps are as follows:
$ cd octave-lyh/
// And my modify the .hg/hgrc files ...
// Show some information
$ hg diff
$ hg status
$ hg summary
parent: 17154:44a301d5551a tip
Add what on jit_fail_exceptions
branch: default
bookmarks: lyh
commit: (clean)
update: (current)
// Show some information
$ hg diff
$ hg status
$ hg summary
parent: 17154:44a301d5551a
Add what on jit_fail_exceptions
branch: default
bookmarks: *lyh
commit: (clean)
update: 185 new changesets, 2 branch heads (merge)
// Merge the official development (An error occurred)
$ hg merge default
abort: default path for subrepository gnulib-hg not found
// Show some information
$ hg diff
diff -r 44a301d5551a .hgsubstate
--- a/.hgsubstate Fri Aug 23 11:33:21 2013 +0800
+++ b/.hgsubstate Sat Aug 24 05:33:06 2013 +0800
@@ -1,1 +1,1 @@
-5a51fb7777a9950502965a043a70bd6ca5e0498b gnulib-hg
+6057744acd2c71c069a4b171c5fe1ff0d86c9e5f gnulib-hg
$ hg status
M .hgsubstate
! build-aux/mkinstalldirs
! libinterp/dldfcn/eigs.cc
! scripts/mkinstalldirs
$ hg summary
parent: 17154:44a301d5551a
Add what on jit_fail_exceptions
branch: default
bookmarks: *lyh
commit: 1 modified, 3 deleted, 1 subrepos
update: 185 new changesets, 2 branch heads (merge)
I am wondering how do I solve this problem. Thanks a lot