Re: Problem with my repository

[lyh.kernel]

Hello Kai,

Even I fix the URL in gnulib-hg/.hg/hgrc, the merge step fail as before. Here is my steps:

I clone my repository first and modify the URLs in hgrc ...

// hg paths under octave-lyh
$ hg paths
public = http://inversethought.com/hg/octave-lyh
private = ssh://address@hidden/hg/repos/octave-lyh
official = http://www.octave.org/hg/octave

// hg paths under octave-lyh/gnulib-hg
$ hg paths
default = http://hg.savannah.gnu.org/hgweb/octave/gnulib-hg

// Now under octave-lyh and begin pulling from official
$ hg update lyh
$ hg pull official
real URL is http://hg.savannah.gnu.org/hgweb/octave
pulling from http://www.octave.org/hg/octave
searching for changes
adding changesets                                                                                                                    
adding manifests
adding file changes                                                                                                                  
added 187 changesets with 943 changes to 531 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)

// 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: 187 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 21:02:00 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: 187 new changesets, 2 branch heads (merge)

I also noticed even I replaces the URL name in gnulib-hg/.hg/hgrc with official. It doesn't work.

But if I use the URL name in .hg/hgrc with default instead of official. The merge step would be success. However I want to reserve my URL name with official. Any suggestion is welcome.

Thanks a lot

2013/8/27 Kai Torben Ohlhus <address@hidden>

On 27 August 2013 04:02, lyh.kernel <address@hidden> wrote:

Hello everyone

I have problem when I want to merge the official development with my repository. My steps are as follows:

// Clone my repository
$ hg clone http://inversethought.com/hg/octave-lyh

$ cd octave-lyh/

// And my modify the .hg/hgrc files ...

$ hg paths
public = http://inversethought.com/hg/octave-lyh
private = ssh://address@hidden/hg/repos/octave-lyh
official = http://www.octave.org/hg/octave

// 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)

// Begin pulling from official
$ hg update lyh
$ hg pull official
real URL is http://hg.savannah.gnu.org/hgweb/octave
pulling from http://www.octave.org/hg/octave
searching for changes
adding changesets                                                                                                                    
adding manifests                                                                                                                     
adding file changes
added 185 changesets with 938 changes to 531 files (+1 heads)
(run 'hg heads' to see heads, 'hg merge' to merge)

// 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

Hi lyh,

I had this problem too. It's because the gnulib subrepository has been updated in the Octave repository recently. Fix the URL in gnulib-hg/.hg/hgrc so it can get the merging done from the original repository. You can change it back after the update and merging process.

--------------------------------------------------------------------

gnulib-hg/.hg/hgrc

--------------------------------------------------------------------

[paths]

default = http://hg.savannah.gnu.org/hgweb/octave/gnulib-hg

--------------------------------------------------------------------

Best,

Kai